mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
menu: fix embedded menu snafu
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. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4750498099
commit
b943c460ff
30
init/Kconfig
30
init/Kconfig
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue