linux-stable/arch/x86/kernel/cpu/mtrr
Linus Torvalds e33c019722 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
2009-12-08 13:27:33 -08:00
..
amd.c x86: Clean up mtrr/amd.c: 2009-07-04 11:10:45 +02:00
centaur.c x86: Clean up mtrr/centaur.c 2009-07-04 11:10:45 +02:00
cleanup.c Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-12-08 13:27:33 -08:00
cyrix.c x86: Clean up mtrr/cyrix.c 2009-07-04 11:10:47 +02:00
generic.c x86: Clean up mtrr/generic.c 2009-07-04 11:10:47 +02:00
if.c x86: Simplify bound checks in the MTRR code 2009-10-02 19:51:56 +02:00
main.c x86, mtrr: make mtrr_aps_delayed_init static bool 2009-08-21 17:00:02 -07:00
Makefile x86: separate mtrr cleanup/mtrr_e820 trim to separate file 2009-03-13 02:52:19 +01:00
mtrr.h x86: Clean up mtrr/mtrr.h 2009-07-04 11:19:52 +02:00
state.c x86: Clean up mtrr/state.c 2009-07-04 11:19:53 +02:00