diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-07-16 13:49:15 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-07-17 11:34:01 +0200 |
commit | 01c9db827146ce321562a992a5dbc1a49b1a99ce (patch) | |
tree | 2014c68991343e5b7ddf0408c2527ff08038e08d /tools/testing/selftests/rcutorture/configs/rcu/TREE06 | |
parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
parent | 187497fa5e9e9383820d33e48b87f8200a747c2a (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull RCU updates from Paul E. McKenney:
* Update RCU documentation.
* Miscellaneous fixes.
* Maintainership changes.
* Torture-test updates.
* Callback-offloading changes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/rcutorture/configs/rcu/TREE06')
-rw-r--r-- | tools/testing/selftests/rcutorture/configs/rcu/TREE06 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE06 b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 index 2e477dfb9c57..8f084cca91bf 100644 --- a/tools/testing/selftests/rcutorture/configs/rcu/TREE06 +++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 @@ -19,7 +19,6 @@ CONFIG_RCU_NOCB_CPU=n CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_PROVE_LOCKING=y CONFIG_PROVE_RCU=y -CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=y |