diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:57:20 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-17 19:57:20 -0400 |
| commit | bb07b00be77fb33274cb44a03bdbf2471e556189 (patch) | |
| tree | 620390077de843dd7626998f0d8441d14a6c66d9 /init | |
| parent | b7165ebbf0898bad9aaeddfa22b918e94ed90e07 (diff) | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
Merge 3.10-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index a5e0917165fe..55ccdf6640ff 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -431,6 +431,7 @@ choice | |||
| 431 | config TREE_RCU | 431 | config TREE_RCU |
| 432 | bool "Tree-based hierarchical RCU" | 432 | bool "Tree-based hierarchical RCU" |
| 433 | depends on !PREEMPT && SMP | 433 | depends on !PREEMPT && SMP |
| 434 | select IRQ_WORK | ||
| 434 | help | 435 | help |
| 435 | This option selects the RCU implementation that is | 436 | This option selects the RCU implementation that is |
| 436 | designed for very large SMP system with hundreds or | 437 | designed for very large SMP system with hundreds or |