diff options
author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:40:54 +0200 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:40:54 +0200 |
commit | 9ab67899804448f2bea4087bb6e9e4d952a79258 (patch) | |
tree | 29ca9054d473e57f6d79638d1d3982f1ffcffcca /init | |
parent | 0de20dc0be1f147959b10903c76f2f41139f417a (diff) | |
parent | f5968c8833f0985b76d38593892acd6558bab149 (diff) |
Merge linux-linaro-3.0-2011.07-1-android-1 into..
..linux-linaro-3.0-2011.07-1_glk3.0
Conflicts:
arch/arm/common/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
kernel/printk.c
Change-Id: I126f34edb1879981909072beefb2738cad26f951
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 0d262bd641d..4e5c05f8c71 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -915,6 +915,12 @@ config SYSCTL config ANON_INODES bool +config PANIC_TIMEOUT + int "Default panic timeout" + default 0 + help + Set default panic timeout. + menuconfig EXPERT bool "Configure standard kernel features (expert users)" help @@ -1081,6 +1087,15 @@ config SHMEM option replaces shmem and tmpfs with the much simpler ramfs code, which may be appropriate on small systems without swap. +config ASHMEM + bool "Enable the Anonymous Shared Memory Subsystem" + default n + depends on SHMEM || TINY_SHMEM + help + The ashmem subsystem is a new shared memory allocator, similar to + POSIX SHM but with different behavior and sporting a simpler + file-based API. + config AIO bool "Enable AIO support" if EXPERT default y |