aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-03-02 17:14:06 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-02 18:49:16 -0500
commit155b25bcc28631a5b5230191aa3f56c40dfffa3f (patch)
tree078d3dbce92fbe568671ee0d16f60f2ec27bb74e
parentd86a1c3de557c019696499ff211b91232fad0fe9 (diff)
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, surround all of the EMBEDDED symbols with "if EMBEDDED"/"endif" so that this EMBEDDED block is clearer. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/Kconfig28
1 files changed, 16 insertions, 12 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f068071fcc5d..90003163e557 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -683,6 +683,8 @@ menuconfig EMBEDDED
683 environments which can tolerate a "non-standard" kernel. 683 environments which can tolerate a "non-standard" kernel.
684 Only use this if you really know what you are doing. 684 Only use this if you really know what you are doing.
685 685
686if EMBEDDED
687
686config UID16 688config UID16
687 bool "Enable 16-bit UID system calls" if EMBEDDED 689 bool "Enable 16-bit UID system calls" if EMBEDDED
688 depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) 690 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
780 This option allows to disable the internal PC-Speaker 782 This option allows to disable the internal PC-Speaker
781 support, saving some memory. 783 support, saving some memory.
782 784
783config COMPAT_BRK
784 bool "Disable heap randomization"
785 default y
786 help
787 Randomizing heap placement makes heap exploits harder, but it
788 also breaks ancient binaries (including anything libc5 based).
789 This option changes the bootup default to heap randomization
790 disabled, and can be overriden runtime by setting
791 /proc/sys/kernel/randomize_va_space to 2.
792
793 On non-ancient distros (post-2000 ones) N is usually a safe choice.
794
795config BASE_FULL 785config BASE_FULL
796 default y 786 default y
797 bool "Enable full-sized data structures for core" if EMBEDDED 787 bool "Enable full-sized data structures for core" if EMBEDDED
@@ -897,6 +887,20 @@ config SLUB_DEBUG
897 SLUB sysfs support. /sys/slab will not exist and there will be 887 SLUB sysfs support. /sys/slab will not exist and there will be
898 no support for cache validation etc. 888 no support for cache validation etc.
899 889
890endif # EMBEDDED
891
892config COMPAT_BRK
893 bool "Disable heap randomization"
894 default y
895 help
896 Randomizing heap placement makes heap exploits harder, but it
897 also breaks ancient binaries (including anything libc5 based).
898 This option changes the bootup default to heap randomization
899 disabled, and can be overriden runtime by setting
900 /proc/sys/kernel/randomize_va_space to 2.
901
902 On non-ancient distros (post-2000 ones) N is usually a safe choice.
903
900choice 904choice
901 prompt "Choose SLAB allocator" 905 prompt "Choose SLAB allocator"
902 default SLUB 906 default SLUB