diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-04-18 08:49:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-04-18 08:49:41 -0400 |
| commit | cb0f3f320d64831afb39940863c5927d6af25514 (patch) | |
| tree | 86aa6eaa055ad5e970fe3e96ac5f438c50f5e285 /lib | |
| parent | 078838d56574694d0a4815d9c1b7f28e8844638b (diff) | |
| parent | 8d7dc9283f399e1fda4e48a1c453f689326d9396 (diff) | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
Pull RCU fix from Paul E. McKenney:
"This series contains a single change that fixes Kconfig asking pointless
questions."
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 93967e634a1e..7815ddd5ae56 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -1281,6 +1281,7 @@ config RCU_TORTURE_TEST_SLOW_INIT_DELAY | |||
| 1281 | int "How much to slow down RCU grace-period initialization" | 1281 | int "How much to slow down RCU grace-period initialization" |
| 1282 | range 0 5 | 1282 | range 0 5 |
| 1283 | default 3 | 1283 | default 3 |
| 1284 | depends on RCU_TORTURE_TEST_SLOW_INIT | ||
| 1284 | help | 1285 | help |
| 1285 | This option specifies the number of jiffies to wait between | 1286 | This option specifies the number of jiffies to wait between |
| 1286 | each rcu_node structure initialization. | 1287 | each rcu_node structure initialization. |