Commit 2450cf51a1bdba7037e91b1bcc494b01c58aaf66
1 parent
43e407071d
Exists in
master
and in
7 other branches
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>
Showing 1 changed file with 12 additions and 16 deletions Side-by-side Diff
init/Kconfig
| ... | ... | @@ -683,8 +683,6 @@ |
| 683 | 683 | environments which can tolerate a "non-standard" kernel. |
| 684 | 684 | Only use this if you really know what you are doing. |
| 685 | 685 | |
| 686 | -if EMBEDDED | |
| 687 | - | |
| 688 | 686 | config UID16 |
| 689 | 687 | bool "Enable 16-bit UID system calls" if EMBEDDED |
| 690 | 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 @@ |
| 782 | 780 | This option allows to disable the internal PC-Speaker |
| 783 | 781 | support, saving some memory. |
| 784 | 782 | |
| 783 | +config 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 | + | |
| 785 | 795 | config BASE_FULL |
| 786 | 796 | default y |
| 787 | 797 | bool "Enable full-sized data structures for core" if EMBEDDED |
| ... | ... | @@ -886,20 +896,6 @@ |
| 886 | 896 | result in significant savings in code size. This also disables |
| 887 | 897 | SLUB sysfs support. /sys/slab will not exist and there will be |
| 888 | 898 | no support for cache validation etc. |
| 889 | - | |
| 890 | -endif # EMBEDDED | |
| 891 | - | |
| 892 | -config 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 | 899 | |
| 904 | 900 | choice |
| 905 | 901 | prompt "Choose SLAB allocator" |