From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 8 Dec 2009 21:27:33 +0000 (-0800)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.33-rc1~374
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e33c01972239fee4696679ae5f7d1f340f424999;p=~shefty%2Frdma-dev.git

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

* '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
---

e33c01972239fee4696679ae5f7d1f340f424999
diff --cc arch/x86/include/asm/x86_init.h
index d8e71459f02,97e5fb4f3bd..ea0e8ea15e1
--- a/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/x86_init.c
index d11c5ff7c65,861b8b54e17..ccd179dec36
--- a/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,
  };