diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:23:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-02 16:23:33 -0800 |
| commit | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (patch) | |
| tree | 406b27ef95cb13f5d99a3b8bfd0a2b2310d33e99 /init | |
| parent | 43e407071d97c1a07a4601896581554a6b3bfd67 (diff) | |
| download | linux-stable-2450cf51a1bdba7037e91b1bcc494b01c58aaf66.tar.gz linux-stable-2450cf51a1bdba7037e91b1bcc494b01c58aaf66.tar.bz2 linux-stable-2450cf51a1bdba7037e91b1bcc494b01c58aaf66.zip | |
Revert "menu: fix embedded menu snafu"
This reverts commit 155b25bcc28631a5b5230191aa3f56c40dfffa3f, which was
totally wrong - the "embedded" options still exists (very much so) even
on non-embedded platforms.
It's just that we don't bother with actually asking about them when
we're not embedded, we just take their default values (which is usually
'y' - the options add features that may not be worth it in a constrained
environment).
Noticed-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/init/Kconfig b/init/Kconfig index 90003163e557..f068071fcc5d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -683,8 +683,6 @@ 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) @@ -782,6 +780,18 @@ 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 @@ -887,20 +897,6 @@ 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 |