Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[deliverable/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index f224dae6e37d69b3a0935e063ee01c88c9b486ec..f755a602d4a176e006dc2cb5830d1c4812bac81f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -272,8 +272,9 @@ config CROSS_MEMORY_ATTACH
          See the man page for more details.
 
 config FHANDLE
-       bool "open by fhandle syscalls"
+       bool "open by fhandle syscalls" if EXPERT
        select EXPORTFS
+       default y
        help
          If you say Y here, a user level program will be able to map
          file names to handle and then later use the handle for
@@ -861,6 +862,28 @@ config LOG_CPU_MAX_BUF_SHIFT
                     13 =>   8 KB for each CPU
                     12 =>   4 KB for each CPU
 
+config NMI_LOG_BUF_SHIFT
+       int "Temporary per-CPU NMI log buffer size (12 => 4KB, 13 => 8KB)"
+       range 10 21
+       default 13
+       depends on PRINTK_NMI
+       help
+         Select the size of a per-CPU buffer where NMI messages are temporary
+         stored. They are copied to the main log buffer in a safe context
+         to avoid a deadlock. The value defines the size as a power of 2.
+
+         NMI messages are rare and limited. The largest one is when
+         a backtrace is printed. It usually fits into 4KB. Select
+         8KB if you want to be on the safe side.
+
+         Examples:
+                    17 => 128 KB for each CPU
+                    16 =>  64 KB for each CPU
+                    15 =>  32 KB for each CPU
+                    14 =>  16 KB for each CPU
+                    13 =>   8 KB for each CPU
+                    12 =>   4 KB for each CPU
+
 #
 # Architectures with an unreliable sched_clock() should select this:
 #
@@ -1466,6 +1489,11 @@ config PRINTK
          very difficult to diagnose system problems, saying N here is
          strongly discouraged.
 
+config PRINTK_NMI
+       def_bool y
+       depends on PRINTK
+       depends on HAVE_NMI
+
 config BUG
        bool "BUG() support" if EXPERT
        default y
@@ -1754,6 +1782,15 @@ config SLOB
 
 endchoice
 
+config SLAB_FREELIST_RANDOM
+       default n
+       depends on SLAB
+       bool "SLAB freelist randomization"
+       help
+         Randomizes the freelist order used on creating new SLABs. This
+         security feature reduces the predictability of the kernel slab
+         allocator against heap overflows.
+
 config SLUB_CPU_PARTIAL
        default y
        depends on SLUB && SMP