Commit 2450cf51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "menu: fix embedded menu snafu" 



This reverts commit 155b25bc, 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43e40707

init/Kconfig

+12 −16
Original line number Diff line number Diff line
@@ -683,8 +683,6 @@ 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)
@@ -782,6 +780,18 @@ 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
@@ -887,20 +897,6 @@ 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE