1 files changed, 13 insertions, 5 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 9afb971497f4..1354ac09b516 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -470,7 +470,6 @@ choice
 config TREE_RCU
         bool "Tree-based hierarchical RCU"
         depends on !PREEMPT && SMP
-        select IRQ_WORK
         help
           This option selects the RCU implementation that is
           designed for very large SMP system with hundreds or
@@ -480,7 +479,6 @@ config TREE_RCU
 config PREEMPT_RCU
         bool "Preemptible tree-based hierarchical RCU"
         depends on PREEMPT
-        select IRQ_WORK
         help
           This option selects the RCU implementation that is
           designed for very large SMP systems with hundreds or
@@ -501,9 +499,17 @@ config TINY_RCU
 
 endchoice
 
+config SRCU
+        bool
+        help
+          This option selects the sleepable version of RCU. This version
+          permits arbitrary sleeping or blocking within RCU read-side critical
+          sections.
+
 config TASKS_RCU
         bool "Task_based RCU implementation using voluntary context switch"
         default n
+        select SRCU
         help
           This option enables a task-based RCU implementation that uses
           only voluntary context switch (not preemption!), idle, and
@@ -668,9 +674,10 @@ config RCU_BOOST
 
 config RCU_KTHREAD_PRIO
         int "Real-time priority to use for RCU worker threads"
-        range 1 99
-        depends on RCU_BOOST
-        default 1
+        range 1 99 if RCU_BOOST
+        range 0 99 if !RCU_BOOST
+        default 1 if RCU_BOOST
+        default 0 if !RCU_BOOST
         help
           This option specifies the SCHED_FIFO priority value that will be
           assigned to the rcuc/n and rcub/n threads and is also the value
@@ -1595,6 +1602,7 @@ config PERF_EVENTS
         depends on HAVE_PERF_EVENTS
         select ANON_INODES
         select IRQ_WORK
+        select SRCU
         help
           Enable kernel support for various performance events provided
           by software and hardware.