diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-10-09 02:39:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-10-09 02:39:25 -0400 |
| commit | fd19bda491207f66d39aeba93487197a087bc00b (patch) | |
| tree | 55d7b07835f045144e2d529bb20136486d1b6691 /tools/testing/selftests | |
| parent | 62731433591156ece255e23ffd69ea4544b424f1 (diff) | |
| parent | 3e28e377204badfc3c4119ff2abda473127ee0ff (diff) | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Pull additional commits for locktorture, from Paul E. McKenney.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests')
3 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/rcutorture/configs/lock/CFLIST b/tools/testing/selftests/rcutorture/configs/lock/CFLIST index 6108137da770..6910b7370761 100644 --- a/tools/testing/selftests/rcutorture/configs/lock/CFLIST +++ b/tools/testing/selftests/rcutorture/configs/lock/CFLIST | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | LOCK01 | 1 | LOCK01 |
| 2 | LOCK02 | 2 | LOCK02 |
| 3 | LOCK03 | 3 | LOCK03 |
| 4 | LOCK04 \ No newline at end of file | ||
diff --git a/tools/testing/selftests/rcutorture/configs/lock/LOCK04 b/tools/testing/selftests/rcutorture/configs/lock/LOCK04 new file mode 100644 index 000000000000..1d1da1477fc3 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/lock/LOCK04 | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | CONFIG_SMP=y | ||
| 2 | CONFIG_NR_CPUS=4 | ||
| 3 | CONFIG_HOTPLUG_CPU=y | ||
| 4 | CONFIG_PREEMPT_NONE=n | ||
| 5 | CONFIG_PREEMPT_VOLUNTARY=n | ||
| 6 | CONFIG_PREEMPT=y | ||
diff --git a/tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot b/tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot new file mode 100644 index 000000000000..48c04fe47fb4 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/lock/LOCK04.boot | |||
| @@ -0,0 +1 @@ | |||
| locktorture.torture_type=rw_lock | |||