Merge branch 'linus' into x86/cpu

diff --combined arch/x86/kernel/quirks.c
index 94ad0c029f02b958863456867f508cad11df5307,7563b31b4f0349f45bf324053a67ecb506a4fced..af71d06624bf5b70b5173ba29238c40b6c21c801
--- 1/arch/x86/kernel/quirks.c
--- 2/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@@ -261,8 -261,6 +261,6 @@@ static void old_ich_force_enable_hpet_u
  {
        if (hpet_force_user)
                old_ich_force_enable_hpet(dev);
-       else
-               hpet_print_force_info();
  }
  
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
@@@ -493,42 -491,5 +491,42 @@@ void force_hpet_resume(void
                break;
        }
  }
 +#endif
 +
 +#if defined(CONFIG_PCI) && defined(CONFIG_NUMA)
 +/* Set correct numa_node information for AMD NB functions */
 +static void __init quirk_amd_nb_node(struct pci_dev *dev)
 +{
 +      struct pci_dev *nb_ht;
 +      unsigned int devfn;
 +      u32 val;
 +
 +      devfn = PCI_DEVFN(PCI_SLOT(dev->devfn), 0);
 +      nb_ht = pci_get_slot(dev->bus, devfn);
 +      if (!nb_ht)
 +              return;
 +
 +      pci_read_config_dword(nb_ht, 0x60, &val);
 +      set_dev_node(&dev->dev, val & 7);
 +      pci_dev_put(dev);
 +}
  
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_ADDRMAP,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_HT,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MAP,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_DRAM,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC,
 +                      quirk_amd_nb_node);
 +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_LINK,
 +                      quirk_amd_nb_node);
  #endif