tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Randy Dunlap and committed by
Linus Torvalds 155b25bc d86a1c3d

+16 -12
+16 -12
init/Kconfig
··· 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 + 686 688 config UID16 687 689 bool "Enable 16-bit UID system calls" if EMBEDDED 688 690 depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION) ··· 781 779 help 782 780 This option allows to disable the internal PC-Speaker 783 781 support, saving some memory. 784 - 785 - config COMPAT_BRK 786 - bool "Disable heap randomization" 787 - default y 788 - help 789 - Randomizing heap placement makes heap exploits harder, but it 790 - also breaks ancient binaries (including anything libc5 based). 791 - This option changes the bootup default to heap randomization 792 - disabled, and can be overriden runtime by setting 793 - /proc/sys/kernel/randomize_va_space to 2. 794 - 795 - On non-ancient distros (post-2000 ones) N is usually a safe choice. 796 782 797 783 config BASE_FULL 798 784 default y ··· 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. 899 + 900 + endif # EMBEDDED 901 + 902 + config COMPAT_BRK 903 + bool "Disable heap randomization" 904 + default y 905 + help 906 + Randomizing heap placement makes heap exploits harder, but it 907 + also breaks ancient binaries (including anything libc5 based). 908 + This option changes the bootup default to heap randomization 909 + disabled, and can be overriden runtime by setting 910 + /proc/sys/kernel/randomize_va_space to 2. 911 + 912 + On non-ancient distros (post-2000 ones) N is usually a safe choice. 889 913 890 914 choice 891 915 prompt "Choose SLAB allocator"