Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155b25bc authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

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: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d86a1c3d

init/Kconfig

+16 −12
Original line number Diff line number Diff line
@@ -683,6 +683,8 @@ menuconfig EMBEDDED 
          environments which can tolerate a "non-standard" kernel.

          Only use this if you really know what you are doing.



if EMBEDDED



config UID16

	bool "Enable 16-bit UID system calls" if EMBEDDED

	depends on ARM || BLACKFIN || CRIS || FRV || H8300 || X86_32 || M68K || (S390 && !64BIT) || SUPERH || SPARC32 || (SPARC64 && COMPAT) || UML || (X86_64 && IA32_EMULATION)
@@ -780,18 +782,6 @@ config PCSPKR_PLATFORM 
          This option allows to disable the internal PC-Speaker

          support, saving some memory.



config COMPAT_BRK

	bool "Disable heap randomization"

	default y

	help

	  Randomizing heap placement makes heap exploits harder, but it

	  also breaks ancient binaries (including anything libc5 based).

	  This option changes the bootup default to heap randomization

	  disabled, and can be overriden runtime by setting

	  /proc/sys/kernel/randomize_va_space to 2.



	  On non-ancient distros (post-2000 ones) N is usually a safe choice.



config BASE_FULL

	default y

	bool "Enable full-sized data structures for core" if EMBEDDED
@@ -897,6 +887,20 @@ config SLUB_DEBUG 
	  SLUB sysfs support. /sys/slab will not exist and there will be

	  no support for cache validation etc.



endif # EMBEDDED



config COMPAT_BRK

	bool "Disable heap randomization"

	default y

	help

	  Randomizing heap placement makes heap exploits harder, but it

	  also breaks ancient binaries (including anything libc5 based).

	  This option changes the bootup default to heap randomization

	  disabled, and can be overriden runtime by setting

	  /proc/sys/kernel/randomize_va_space to 2.



	  On non-ancient distros (post-2000 ones) N is usually a safe choice.



choice

	prompt "Choose SLAB allocator"

	default SLUB