diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/init/Kconfig b/init/Kconfig index 28deb709131a..69d5190918e5 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -735,6 +735,9 @@ config CC_OPTIMIZE_FOR_SIZE | |||
735 | config SYSCTL | 735 | config SYSCTL |
736 | bool | 736 | bool |
737 | 737 | ||
738 | config ANON_INODES | ||
739 | bool | ||
740 | |||
738 | menuconfig EMBEDDED | 741 | menuconfig EMBEDDED |
739 | bool "Configure standard kernel features (for small systems)" | 742 | bool "Configure standard kernel features (for small systems)" |
740 | help | 743 | help |
@@ -840,18 +843,6 @@ config PCSPKR_PLATFORM | |||
840 | This option allows to disable the internal PC-Speaker | 843 | This option allows to disable the internal PC-Speaker |
841 | support, saving some memory. | 844 | support, saving some memory. |
842 | 845 | ||
843 | config COMPAT_BRK | ||
844 | bool "Disable heap randomization" | ||
845 | default y | ||
846 | help | ||
847 | Randomizing heap placement makes heap exploits harder, but it | ||
848 | also breaks ancient binaries (including anything libc5 based). | ||
849 | This option changes the bootup default to heap randomization | ||
850 | disabled, and can be overriden runtime by setting | ||
851 | /proc/sys/kernel/randomize_va_space to 2. | ||
852 | |||
853 | On non-ancient distros (post-2000 ones) N is usually a safe choice. | ||
854 | |||
855 | config BASE_FULL | 846 | config BASE_FULL |
856 | default y | 847 | default y |
857 | bool "Enable full-sized data structures for core" if EMBEDDED | 848 | bool "Enable full-sized data structures for core" if EMBEDDED |
@@ -869,9 +860,6 @@ config FUTEX | |||
869 | support for "fast userspace mutexes". The resulting kernel may not | 860 | support for "fast userspace mutexes". The resulting kernel may not |
870 | run glibc-based applications correctly. | 861 | run glibc-based applications correctly. |
871 | 862 | ||
872 | config ANON_INODES | ||
873 | bool | ||
874 | |||
875 | config EPOLL | 863 | config EPOLL |
876 | bool "Enable eventpoll support" if EMBEDDED | 864 | bool "Enable eventpoll support" if EMBEDDED |
877 | default y | 865 | default y |
@@ -957,6 +945,18 @@ config SLUB_DEBUG | |||
957 | SLUB sysfs support. /sys/slab will not exist and there will be | 945 | SLUB sysfs support. /sys/slab will not exist and there will be |
958 | no support for cache validation etc. | 946 | no support for cache validation etc. |
959 | 947 | ||
948 | config COMPAT_BRK | ||
949 | bool "Disable heap randomization" | ||
950 | default y | ||
951 | help | ||
952 | Randomizing heap placement makes heap exploits harder, but it | ||
953 | also breaks ancient binaries (including anything libc5 based). | ||
954 | This option changes the bootup default to heap randomization | ||
955 | disabled, and can be overriden runtime by setting | ||
956 | /proc/sys/kernel/randomize_va_space to 2. | ||
957 | |||
958 | On non-ancient distros (post-2000 ones) N is usually a safe choice. | ||
959 | |||
960 | choice | 960 | choice |
961 | prompt "Choose SLAB allocator" | 961 | prompt "Choose SLAB allocator" |
962 | default SLUB | 962 | default SLUB |