checkpatch: yet another commit id improvement

[cascardo/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 557bdf1..8f08f49 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -55,6 +55,7 @@ config CROSS_COMPILE
 
 config COMPILE_TEST
        bool "Compile also drivers which will not load"
+       depends on !UML
        default n
        help
          Some drivers can be compiled on a different platform than they are
@@ -852,8 +853,8 @@ config LOG_CPU_MAX_BUF_SHIFT
          used as it forces an exact (power of two) size of the ring buffer.
 
          The number of possible CPUs is used for this computation ignoring
-         hotplugging making the compuation optimal for the the worst case
-         scenerio while allowing a simple algorithm to be used from bootup.
+         hotplugging making the computation optimal for the worst case
+         scenario while allowing a simple algorithm to be used from bootup.
 
          Examples shift values and their meaning:
                     17 => 128 KB for each CPU
@@ -952,7 +953,7 @@ menuconfig CGROUPS
          controls or device isolation.
          See
                - Documentation/scheduler/sched-design-CFS.txt  (CFS)
-               - Documentation/cgroups/ (features for grouping, isolation
+               - Documentation/cgroup-v1/ (features for grouping, isolation
                                          and resource control)
 
          Say N if unsure.
@@ -1009,7 +1010,7 @@ config BLK_CGROUP
        CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
        CONFIG_BLK_DEV_THROTTLING=y.
 
-       See Documentation/cgroups/blkio-controller.txt for more information.
+       See Documentation/cgroup-v1/blkio-controller.txt for more information.
 
 config DEBUG_BLK_CGROUP
        bool "IO controller debugging"
@@ -1786,10 +1787,10 @@ endchoice
 
 config SLAB_FREELIST_RANDOM
        default n
-       depends on SLAB
+       depends on SLAB || SLUB
        bool "SLAB freelist randomization"
        help
-         Randomizes the freelist order used on creating new SLABs. This
+         Randomizes the freelist order used on creating new pages. This
          security feature reduces the predictability of the kernel slab
          allocator against heap overflows.