summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-06-05 15:02:47 -0700
committerSam Ravnborg <sam@ravnborg.org>2009-06-09 22:37:54 +0200
commita9eb522375abc79c2bf23940a067bc0046276236 (patch)
tree762b32bcae450844b0c91295a74e520aa626e0b1 /init
parent8b8b76c045beb85c1c2b28e07eff6599a1e95cf1 (diff)
downloadlinux-3.10-a9eb522375abc79c2bf23940a067bc0046276236.tar.gz
linux-3.10-a9eb522375abc79c2bf23940a067bc0046276236.tar.bz2
linux-3.10-a9eb522375abc79c2bf23940a067bc0046276236.zip
menu: fix embedded menu presentation
The STRIP_ASM_SYMS kconfig symbol mucks up the embedded menu because STRIP_ASM_SYMS is in the middle of the embedded menu items but it does not depend on EMBEDDED. Move it to beyond the end of the embedded menu so that the menu is presented correctly. Or if STRIP_ASM_SYMS should depend on EMBEDDED, that can also be fixed. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig16
1 files changed, 8 insertions, 8 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 7be4d383674..4389cee99db 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -808,14 +808,6 @@ config KALLSYMS_EXTRA_PASS
you wait for kallsyms to be fixed.
-config STRIP_ASM_SYMS
- bool "Strip assembler-generated symbols during link"
- default n
- help
- Strip internal assembler-generated symbols during a link (symbols
- that look like '.Lxxx') so they don't pollute the output of
- get_wchan() and suchlike.
-
config HOTPLUG
bool "Support for hot-pluggable devices" if EMBEDDED
default y
@@ -961,6 +953,14 @@ config SLUB_DEBUG
SLUB sysfs support. /sys/slab will not exist and there will be
no support for cache validation etc.
+config STRIP_ASM_SYMS
+ bool "Strip assembler-generated symbols during link"
+ default n
+ help
+ Strip internal assembler-generated symbols during a link (symbols
+ that look like '.Lxxx') so they don't pollute the output of
+ get_wchan() and suchlike.
+
config COMPAT_BRK
bool "Disable heap randomization"
default y