From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2011 17:14:56 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=41e0e0738cf864f4f49b11aac804496999b311d9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, AMD: Set ARAT feature on AMD processors
  x86, quirk: Fix SB600 revision check
  x86: stop_machine_text_poke() should issue sync_core()
  x86, amd-nb: Misc cleanliness fixes
---

41e0e0738cf864f4f49b11aac804496999b311d9
diff --cc arch/x86/include/asm/amd_nb.h
index e264ae5a1443,527fb966ab5c..331682231bb4
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@@ -13,10 -13,11 +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);