Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
  x86, mm: Correct the implementation of is_untracked_pat_range()
  x86/pat: Trivial: don't create debugfs for memtype if pat is disabled
  x86, mtrr: Fix sorting of mtrr after subtracting
  x86: Move find_smp_config() earlier and avoid bootmem usage
  x86, platform: Change is_untracked_pat_range() to bool; cleanup init
  x86: Change is_ISA_range() into an inline function
  x86, mm: is_untracked_pat_range() takes a normal semiclosed range
  x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()
  x86: UV SGI: Don't track GRU space in PAT
  x86: SGI UV: Fix BAU initialization
  x86, numa: Use near(er) online node instead of roundrobin for NUMA
  x86, numa, bootmem: Only free bootmem on NUMA failure path
  x86: Change crash kernel to reserve via reserve_early()
  x86: Eliminate redundant/contradicting cache line size config options
  x86: When cleaning MTRRs, do not fold WP into UC
  x86: remove "extern" from function prototypes in <asm/proto.h>
  x86, mm: Report state of NX protections during boot
  x86, mm: Clean up and simplify NX enablement
  x86, pageattr: Make set_memory_(x|nx) aware of NX support
  x86, sleep: Always save the value of EFER
  ...

Fix up conflicts (added both iommu_shutdown and is_untracked_pat_range)
to 'struct x86_platform_ops') in
	arch/x86/include/asm/x86_init.h
	arch/x86/kernel/x86_init.c

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

diff --cc arch/x86/include/asm/cacheflush.h
Simple merge

diff --cc arch/x86/include/asm/mpspec.h
Simple merge

diff --cc arch/x86/include/asm/x86_init.h
index d8e71459f025a3c4c08225d148e67bbb895f851a,97e5fb4f3bd3dec1d58124c14be7c4b99d3e46da..ea0e8ea15e155e6033c34b9ec3bab17f7cc28f9c
--- 1/arch/x86/include/asm/x86_init.h
--- 2/arch/x86/include/asm/x86_init.h
+++ b/arch/x86/include/asm/x86_init.h
@@@ -130,7 -122,7 +131,8 @@@ struct x86_platform_ops 
        unsigned long (*calibrate_tsc)(void);
        unsigned long (*get_wallclock)(void);
        int (*set_wallclock)(unsigned long nowtime);
 +      void (*iommu_shutdown)(void);
+       bool (*is_untracked_pat_range)(u64 start, u64 end);
  };
  
  extern struct x86_init_ops x86_init;

diff --cc arch/x86/kernel/apic/numaq_32.c
Simple merge

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge

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

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

diff --cc arch/x86/kernel/ftrace.c
Simple merge

diff --cc arch/x86/kernel/head_64.S
Simple merge

diff --cc arch/x86/kernel/machine_kexec_32.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/tlb_uv.c
Simple merge

diff --cc arch/x86/kernel/visws_quirks.c
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/kernel/x86_init.c
index d11c5ff7c65ede5f752449c630200cda0620fce2,861b8b54e17281ae343c6341365cc837e1e56cab..ccd179dec36e8f82da0b6484e7307dda16a7ed30
--- 1/arch/x86/kernel/x86_init.c
--- 2/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@@ -13,8 -13,8 +13,9 @@@
  #include <asm/e820.h>
  #include <asm/time.h>
  #include <asm/irq.h>
+ #include <asm/pat.h>
  #include <asm/tsc.h>
 +#include <asm/iommu.h>
  
  void __cpuinit x86_init_noop(void) { }
  void __init x86_init_uint_noop(unsigned int unused) { }
@@@ -79,5 -73,5 +80,6 @@@ struct x86_platform_ops x86_platform = 
        .calibrate_tsc                  = native_calibrate_tsc,
        .get_wallclock                  = mach_get_cmos_time,
        .set_wallclock                  = mach_set_rtc_mmss,
 +      .iommu_shutdown                 = iommu_shutdown_noop,
+       .is_untracked_pat_range         = is_ISA_range,
  };

diff --cc arch/x86/mm/srat_64.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge