aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-02 19:23:33 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-02 19:23:33 -0500
commit2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (patch)
tree406b27ef95cb13f5d99a3b8bfd0a2b2310d33e99 /init/Kconfig
parent43e407071d97c1a07a4601896581554a6b3bfd67 (diff)
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/Kconfig')
-rw-r--r--init/Kconfig28
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
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
688config UID16 686config UID16
689 bool "Enable 16-bit UID system calls" if EMBEDDED 687 bool "Enable 16-bit UID system calls" if EMBEDDED
690 depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) 688 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
782 This option allows to disable the internal PC-Speaker 780 This option allows to disable the internal PC-Speaker
783 support, saving some memory. 781 support, saving some memory.
784 782
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
785config BASE_FULL 795config BASE_FULL
786 default y 796 default y
787 bool "Enable full-sized data structures for core" if EMBEDDED 797 bool "Enable full-sized data structures for core" if EMBEDDED
@@ -887,20 +897,6 @@ config SLUB_DEBUG
887 SLUB sysfs support. /sys/slab will not exist and there will be 897 SLUB sysfs support. /sys/slab will not exist and there will be
888 no support for cache validation etc. 898 no support for cache validation etc.
889 899
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
904choice 900choice
905 prompt "Choose SLAB allocator" 901 prompt "Choose SLAB allocator"
906 default SLUB 902 default SLUB