menu: fix embedded menu snafu
PATCH 1/1 menu: fix embedded menu snafu
From: Randy Dunlap <[email protected]>
The COMPAT_BRK kconfig symbol does not depend on EMBEDDED, but it is in the midst of the EMBEDDED menu symbols, so it mucks up the EMBEDDED menu. Fix by moving it to just after all of the EMBEDDED menu symbols. Also, surround all of the EMBEDDED symbols with "if EMBEDDED"/"endif" so that this EMBEDDED block is clearer.
--- init/Kconfig | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
init/Kconfig +16 -12
@@ -683,6 +683,8 @@ menuconfig EMBEDDED environments which can tolerate a "non-standard" kernel. Only use this if you really know what you are doing. +if EMBEDDED + config UID16 bool "Enable 16-bit UID system calls" if EMBEDDED depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -780,18 +782,6 @@ config PCSPKR_PLATFORM This option allows to disable the internal PC-Speaker support, saving some memory. -config COMPAT_BRK - bool "Disable heap randomization" - default y - help - Randomizing heap placement makes heap exploits harder, but it - also breaks ancient binaries (including anything libc5 based). - This option changes the bootup default to heap randomization - disabled, and can be overriden runtime by setting - /proc/sys/kernel/randomize_va_space to 2. - - On non-ancient distros (post-2000 ones) N is usually a safe choice. - config BASE_FULL default y bool "Enable full-sized data structures for core" if EMBEDDED
@@ -897,6 +887,20 @@ config SLUB_DEBUG SLUB sysfs support. /sys/slab will not exist and there will be no support for cache validation etc. +endif # EMBEDDED + +config COMPAT_BRK + bool "Disable heap randomization" + default y + help + Randomizing heap placement makes heap exploits harder, but it + also breaks ancient binaries (including anything libc5 based). + This option changes the bootup default to heap randomization + disabled, and can be overriden runtime by setting + /proc/sys/kernel/randomize_va_space to 2. + + On non-ancient distros (post-2000 ones) N is usually a safe choice. + choice prompt "Choose SLAB allocator" default SLUB
Quoted 6 lines · On Mon, 2 Mar 2009 14:14:06 -0800 Randy Dunlap <[email protected]> wrote:
The
COMPAT_BRKkconfig symbol does not depend on EMBEDDED, but it is in the midst of the EMBEDDED menu symbols, so it mucks up the EMBEDDED menu. Fix by moving it to just after all of the EMBEDDED menu symbols. Also, surround all of the EMBEDDED symbols with "if EMBEDDED"/"endif" so that this EMBEDDED block is clearer.
This patch causes weird unintended breakage, methinks.
x86_64 allnoconfig does:
mm/bootmem.c: In function 'mark_bootmem':mm/bootmem.c:321: warning: control reaches end of non-void function
because
}
BUG();
}gets preprocessed down to
}
;
}because all BUG-related config options got removed:
akpm2:/usr/src/25> make allnoconfigscripts/kconfig/conf -n arch/x86/Kconfig
#
# configuration written to .config # akpm2:/usr/src/25> grep BUG .config CONFIG_X86_DEBUGCTLMSR=y # CONFIG_INPUT_EVBUG is not set # CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_DEBUG_MEMORY_INIT=y
I think I'll wait for version 2...
Quoted 2 lines · Andrew Morton
This patch causes weird unintended breakage, methinks.
Damn, you're right. It looked obvious, so I already applied it, but I clearly shouldn't have.
The whole "if EMBEDDED" thing is totally wrong, because those config options very much_do_ exist even when non-embedded, it's just that then they always take their default valies.
Thanks for noticing.
Linus
Quoted 4 lines · Linus Torvalds
Quoted 2 lines · Andrew Morton
This patch causes weird unintended breakage, methinks.
Quoted 8 lines
Damn, you're right. It looked obvious, so I already applied it, but I clearly shouldn't have.
The whole "if EMBEDDED" thing is totally wrong, because those config options very
much_do_exist even when non-embedded, it's just that then they always take their default valies.Thanks for noticing.
probably also explains weird build breakages i've been getting since i updated to your latest:
CC kernel/futex.o
In file included from kernel/futex.c:61:kernel/rtmutex_common.h: In function ‘task_has_pi_waiters’:kernel/rtmutex_common.h:81: error: ‘struct task_struct’ has no member named ‘pi_waiters’kernel/rtmutex_common.h: In function ‘task_top_pi_waiter’:kernel/rtmutex_common.h:87: error: ‘struct task_struct’ has no member named ‘pi_waiters’
make[1]: *** [kernel/futex.o] Error 1
Ingo
PATCH v2 1/1 menu: fix embedded menu snafu
In reply to Linus TorvaldsQuoted 10 lines · Linus Torvalds
Quoted 1 line · Andrew Morton
This patch causes weird unintended breakage, methinks.
Damn, you're right. It looked obvious, so I already applied it, but I clearly shouldn't have.
The whole "if EMBEDDED" thing is totally wrong, because those config options very
much_do_exist even when non-embedded, it's just that then they always take their default valies.
Crud. OK, v2, probably just for Andrew for now (?).
From: Randy Dunlap <[email protected]>
The COMPAT_BRK kconfig symbol does not depend on EMBEDDED, but it is in the midst of the EMBEDDED menu symbols, so it mucks up the EMBEDDED menu. Fix by moving it to just after all of the EMBEDDED menu symbols. Also, ANON_INODES has a similar problem, so move it to just above the EMBEDDED menu items since it is used in the EMBEDDED menu.
--- init/Kconfig | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
init/Kconfig +15 -15
@@ -675,6 +675,9 @@ config CC_OPTIMIZE_FOR_SIZE config SYSCTL bool +config ANON_INODES + bool + menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help
@@ -780,18 +783,6 @@ config PCSPKR_PLATFORM This option allows to disable the internal PC-Speaker support, saving some memory. -config COMPAT_BRK - bool "Disable heap randomization" - default y - help - Randomizing heap placement makes heap exploits harder, but it - also breaks ancient binaries (including anything libc5 based). - This option changes the bootup default to heap randomization - disabled, and can be overriden runtime by setting - /proc/sys/kernel/randomize_va_space to 2. - - On non-ancient distros (post-2000 ones) N is usually a safe choice. - config BASE_FULL default y bool "Enable full-sized data structures for core" if EMBEDDED
@@ -809,9 +800,6 @@ config FUTEX support for "fast userspace mutexes". The resulting kernel may not run glibc-based applications correctly. -config ANON_INODES - bool - config EPOLL bool "Enable eventpoll support" if EMBEDDED default y
@@ -897,6 +885,18 @@ config SLUB_DEBUG SLUB sysfs support. /sys/slab will not exist and there will be no support for cache validation etc. +config COMPAT_BRK + bool "Disable heap randomization" + default y + help + Randomizing heap placement makes heap exploits harder, but it + also breaks ancient binaries (including anything libc5 based). + This option changes the bootup default to heap randomization + disabled, and can be overriden runtime by setting + /proc/sys/kernel/randomize_va_space to 2. + + On non-ancient distros (post-2000 ones) N is usually a safe choice. + choice prompt "Choose SLAB allocator" default SLUB