aboutsummaryrefslogtreecommitdiffstats
path: root/init/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'init/Kconfig')
-rw-r--r--init/Kconfig30
1 files changed, 15 insertions, 15 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f068071fcc5d..6a5c5fed66c9 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -675,6 +675,9 @@ config CC_OPTIMIZE_FOR_SIZE
675config SYSCTL 675config SYSCTL
676 bool 676 bool
677 677
678config ANON_INODES
679 bool
680
678menuconfig EMBEDDED 681menuconfig EMBEDDED
679 bool "Configure standard kernel features (for small systems)" 682 bool "Configure standard kernel features (for small systems)"
680 help 683 help
@@ -780,18 +783,6 @@ config PCSPKR_PLATFORM
780 This option allows to disable the internal PC-Speaker 783 This option allows to disable the internal PC-Speaker
781 support, saving some memory. 784 support, saving some memory.
782 785
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 786config BASE_FULL
796 default y 787 default y
797 bool "Enable full-sized data structures for core" if EMBEDDED 788 bool "Enable full-sized data structures for core" if EMBEDDED
@@ -809,9 +800,6 @@ config FUTEX
809 support for "fast userspace mutexes". The resulting kernel may not 800 support for "fast userspace mutexes". The resulting kernel may not
810 run glibc-based applications correctly. 801 run glibc-based applications correctly.
811 802
812config ANON_INODES
813 bool
814
815config EPOLL 803config EPOLL
816 bool "Enable eventpoll support" if EMBEDDED 804 bool "Enable eventpoll support" if EMBEDDED
817 default y 805 default y
@@ -897,6 +885,18 @@ config SLUB_DEBUG
897 SLUB sysfs support. /sys/slab will not exist and there will be 885 SLUB sysfs support. /sys/slab will not exist and there will be
898 no support for cache validation etc. 886 no support for cache validation etc.
899 887
888config COMPAT_BRK
889 bool "Disable heap randomization"
890 default y
891 help
892 Randomizing heap placement makes heap exploits harder, but it
893 also breaks ancient binaries (including anything libc5 based).
894 This option changes the bootup default to heap randomization
895 disabled, and can be overriden runtime by setting
896 /proc/sys/kernel/randomize_va_space to 2.
897
898 On non-ancient distros (post-2000 ones) N is usually a safe choice.
899
900choice 900choice
901 prompt "Choose SLAB allocator" 901 prompt "Choose SLAB allocator"
902 default SLUB 902 default SLUB