aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2012-01-16 14:57:18 -0500
committerIngo Molnar <mingo@elte.hu>2012-01-17 04:41:36 -0500
commit5ee71535440f034de1196b11f78cef81c4025c2b (patch)
treeabca63bbad6162112a92af63d2a061c4805e6771
parentb54bd9be35f4084edb3eb9ee054a43f722a67483 (diff)
x86/kconfig: Move the ZONE_DMA entry under a menu
Move the ZONE_DMA kconfig symbol under a menu item instead of having it listed before everything else in "make {xconfig | gconfig | nconfig | menuconfig}". This drops the first line of the top-level kernel config menu (in 3.2) below and moves it under "Processor type and features". [*] DMA memory allocation support General setup ---> [*] Enable loadable module support ---> [*] Enable the block layer ---> Processor type and features ---> Power management and ACPI options ---> Bus options (PCI etc.) ---> Executable file formats / Emulations ---> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: David Rientjes <rientjes@google.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: linux-mm@kvack.org <linux-mm@kvack.org> Link: http://lkml.kernel.org/r/4F14811E.6090107@xenotime.net Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: David Rientjes <rientjes@google.com>
-rw-r--r--arch/x86/Kconfig20
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5731eb70e0a0..db190faffba1 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -120,16 +120,6 @@ config HAVE_LATENCYTOP_SUPPORT
120config MMU 120config MMU
121 def_bool y 121 def_bool y
122 122
123config ZONE_DMA
124 bool "DMA memory allocation support" if EXPERT
125 default y
126 help
127 DMA memory allocation support allows devices with less than 32-bit
128 addressing to allocate within the first 16MB of address space.
129 Disable if no such devices will be used.
130
131 If unsure, say Y.
132
133config SBUS 123config SBUS
134 bool 124 bool
135 125
@@ -253,6 +243,16 @@ source "kernel/Kconfig.freezer"
253 243
254menu "Processor type and features" 244menu "Processor type and features"
255 245
246config ZONE_DMA
247 bool "DMA memory allocation support" if EXPERT
248 default y
249 help
250 DMA memory allocation support allows devices with less than 32-bit
251 addressing to allocate within the first 16MB of address space.
252 Disable if no such devices will be used.
253
254 If unsure, say Y.
255
256source "kernel/time/Kconfig" 256source "kernel/time/Kconfig"
257 257
258config SMP 258config SMP