Merge branch 'linus' into x86/urgent

Merge reason: Merge upstream commits to avoid conflicts in upcoming patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc arch/x86/Kconfig.cpu
Simple merge

diff --cc arch/x86/include/asm/amd_nb.h
index 527fb966ab5cce5f336c6f593d8e6a85c144d10e,e264ae5a144347c30aadac9561cd38af1fa418ab..331682231bb43c6a2a7ff7c40c1352cdeddd82f1
--- 1/arch/x86/include/asm/amd_nb.h
--- 2/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@@ -13,11 -13,10 +13,10 @@@ extern const struct pci_device_id amd_n
  extern const struct amd_nb_bus_dev_range amd_nb_bus_dev_ranges[];
  struct bootnode;
  
 -extern int early_is_amd_nb(u32 value);
 +extern bool early_is_amd_nb(u32 value);
  extern int amd_cache_northbridges(void);
  extern void amd_flush_garts(void);
- extern int amd_numa_init(unsigned long start_pfn, unsigned long end_pfn);
- extern int amd_scan_nodes(void);
+ extern int amd_numa_init(void);
  extern int amd_get_subcaches(int);
  extern int amd_set_subcaches(int, int);
  

diff --cc arch/x86/kernel/cpu/amd.c
Simple merge