Merge branch 'mymd/for-next' into mymd/for-linus

[deliverable/linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c02d89777713b8772e47c2759570f4a838cb18e7..504057925ee9df37a9cfa9cfc200cb1071f1b23d 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -375,9 +375,11 @@ config VIRT_CPU_ACCOUNTING_GEN
 
          If unsure, say N.
 
+endchoice
+
 config IRQ_TIME_ACCOUNTING
        bool "Fine granularity task level IRQ time accounting"
-       depends on HAVE_IRQ_TIME_ACCOUNTING && !NO_HZ_FULL
+       depends on HAVE_IRQ_TIME_ACCOUNTING && !VIRT_CPU_ACCOUNTING_NATIVE
        help
          Select this option to enable fine granularity task irq time
          accounting. This is done by reading a timestamp on each
@@ -386,8 +388,6 @@ config IRQ_TIME_ACCOUNTING
 
          If in doubt, say N here.
 
-endchoice
-
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
        depends on MULTIUSER
@@ -517,6 +517,7 @@ config SRCU
 config TASKS_RCU
        bool
        default n
+       depends on !UML
        select SRCU
        help
          This option enables a task-based RCU implementation that uses
@@ -1785,10 +1786,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.