aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig9
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dcb0593b4a66..542bb2610cbb 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -27,6 +27,7 @@ config X86
27 select HAVE_PERF_EVENTS if (!M386 && !M486) 27 select HAVE_PERF_EVENTS if (!M386 && !M486)
28 select HAVE_IOREMAP_PROT 28 select HAVE_IOREMAP_PROT
29 select HAVE_KPROBES 29 select HAVE_KPROBES
30 select HAVE_MEMBLOCK
30 select ARCH_WANT_OPTIONAL_GPIOLIB 31 select ARCH_WANT_OPTIONAL_GPIOLIB
31 select ARCH_WANT_FRAME_POINTERS 32 select ARCH_WANT_FRAME_POINTERS
32 select HAVE_DMA_ATTRS 33 select HAVE_DMA_ATTRS
@@ -195,9 +196,6 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING
195config ARCH_SUPPORTS_DEBUG_PAGEALLOC 196config ARCH_SUPPORTS_DEBUG_PAGEALLOC
196 def_bool y 197 def_bool y
197 198
198config HAVE_EARLY_RES
199 def_bool y
200
201config HAVE_INTEL_TXT 199config HAVE_INTEL_TXT
202 def_bool y 200 def_bool y
203 depends on EXPERIMENTAL && DMAR && ACPI 201 depends on EXPERIMENTAL && DMAR && ACPI
@@ -590,14 +588,13 @@ config NO_BOOTMEM
590 default y 588 default y
591 bool "Disable Bootmem code" 589 bool "Disable Bootmem code"
592 ---help--- 590 ---help---
593 Use early_res directly instead of bootmem before slab is ready. 591 Use memblock directly instead of bootmem before slab is ready.
594 - allocator (buddy) [generic] 592 - allocator (buddy) [generic]
595 - early allocator (bootmem) [generic] 593 - early allocator (bootmem) [generic]
596 - very early allocator (reserve_early*()) [x86] 594 - very early allocator (memblock) [some generic]
597 - very very early allocator (early brk model) [x86] 595 - very very early allocator (early brk model) [x86]
598 So reduce one layer between early allocator to final allocator 596 So reduce one layer between early allocator to final allocator
599 597
600
601config MEMTEST 598config MEMTEST
602 bool "Memtest" 599 bool "Memtest"
603 ---help--- 600 ---help---