Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 132169
b: refs/heads/master
c: b943c46
h: refs/heads/master
i:
  132167: 4a3abc6
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Mar 10, 2009
1 parent 42ef8b5 commit 5ef7c6a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 475049809977bf3975d78f2d2fd992e19ce2d59e
refs/heads/master: b943c460ff8556a193b28e2145b513f8b978e869
30 changes: 15 additions & 15 deletions trunk/init/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,9 @@ config CC_OPTIMIZE_FOR_SIZE
config SYSCTL
bool

config ANON_INODES
bool

menuconfig EMBEDDED
bool "Configure standard kernel features (for small systems)"
help
Expand Down Expand Up @@ -780,18 +783,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
Expand All @@ -809,9 +800,6 @@ config FUTEX
support for "fast userspace mutexes". The resulting kernel may not
run glibc-based applications correctly.

config ANON_INODES
bool

config EPOLL
bool "Enable eventpoll support" if EMBEDDED
default y
Expand Down Expand Up @@ -897,6 +885,18 @@ config SLUB_DEBUG
SLUB sysfs support. /sys/slab will not exist and there will be
no support for cache validation etc.

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
Expand Down

0 comments on commit 5ef7c6a

Please sign in to comment.