diff options
| author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2014-12-24 04:55:28 -0500 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2015-01-06 14:01:17 -0500 |
| commit | 5a43b88e98eaca88fa12abcacd0000adc879dd2c (patch) | |
| tree | 30c169195f7a65c68256e43fecd2d12b0149c0b5 | |
| parent | 41050a009640f9f330a5b916563ca7faf853a98c (diff) | |
rcu: Remove "select IRQ_WORK" from config TREE_RCU
The 48a7639ce80c ("rcu: Make callers awaken grace-period kthread")
removed the irq_work_queue(), so the TREE_RCU doesn't need
irq work any more. This commit therefore updates RCU's Kconfig and
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
| -rw-r--r-- | init/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/rcu/tree.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 9afb971497f4..39b4313c6ca6 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -470,7 +470,6 @@ choice | |||
| 470 | config TREE_RCU | 470 | config TREE_RCU |
| 471 | bool "Tree-based hierarchical RCU" | 471 | bool "Tree-based hierarchical RCU" |
| 472 | depends on !PREEMPT && SMP | 472 | depends on !PREEMPT && SMP |
| 473 | select IRQ_WORK | ||
| 474 | help | 473 | help |
| 475 | This option selects the RCU implementation that is | 474 | This option selects the RCU implementation that is |
| 476 | designed for very large SMP system with hundreds or | 475 | designed for very large SMP system with hundreds or |
| @@ -480,7 +479,6 @@ config TREE_RCU | |||
| 480 | config PREEMPT_RCU | 479 | config PREEMPT_RCU |
| 481 | bool "Preemptible tree-based hierarchical RCU" | 480 | bool "Preemptible tree-based hierarchical RCU" |
| 482 | depends on PREEMPT | 481 | depends on PREEMPT |
| 483 | select IRQ_WORK | ||
| 484 | help | 482 | help |
| 485 | This option selects the RCU implementation that is | 483 | This option selects the RCU implementation that is |
| 486 | designed for very large SMP systems with hundreds or | 484 | designed for very large SMP systems with hundreds or |
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h index cb5908672f11..41860b9a04a2 100644 --- a/kernel/rcu/tree.h +++ b/kernel/rcu/tree.h | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/threads.h> | 27 | #include <linux/threads.h> |
| 28 | #include <linux/cpumask.h> | 28 | #include <linux/cpumask.h> |
| 29 | #include <linux/seqlock.h> | 29 | #include <linux/seqlock.h> |
| 30 | #include <linux/irq_work.h> | ||
| 31 | 30 | ||
| 32 | /* | 31 | /* |
| 33 | * Define shape of hierarchy based on NR_CPUS, CONFIG_RCU_FANOUT, and | 32 | * Define shape of hierarchy based on NR_CPUS, CONFIG_RCU_FANOUT, and |
