diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 11:06:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 11:06:59 -0700 |
| commit | 02171b4a7c5b555d08c3321332e0c45776518276 (patch) | |
| tree | 63f10cdab2a8c1bd9fe5ff29319323ff59419ef8 /arch/x86/Kconfig | |
| parent | 70311aaa8afb9790fb91886749cbf80e7e6cd8d0 (diff) | |
| parent | 20167d3421a089a1bf1bd680b150dc69c9506810 (diff) | |
| download | linux-02171b4a7c5b555d08c3321332e0c45776518276.tar.bz2 | |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm changes from Ingo Molnar:
"This tree includes a micro-optimization that avoids cr3 switches
during idling; it fixes corner cases and there's also small cleanups"
Fix up trivial context conflict with the percpu_xx -> this_cpu_xx
changes.
* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64: Fix accounting in kernel_physical_mapping_init()
x86/tlb: Clean up and unify TLB_FLUSH_ALL definition
x86: Drop obsolete ARCH_BOOTMEM support
x86, tlb: Switch cr3 in leave_mm() only when needed
x86/mm: Fix the size calculation of mapping tables
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 21ea6d28d71f..5ab807c1192a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1238,10 +1238,6 @@ config NODES_SHIFT Specify the maximum number of NUMA Nodes available on the target system. Increases memory reserved to accommodate various tables. -config HAVE_ARCH_BOOTMEM - def_bool y - depends on X86_32 && NUMA - config HAVE_ARCH_ALLOC_REMAP def_bool y depends on X86_32 && NUMA |