diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /tools/testing/selftests/rcutorture/configs/rcu/SRCU-P | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'tools/testing/selftests/rcutorture/configs/rcu/SRCU-P')
| -rw-r--r-- | tools/testing/selftests/rcutorture/configs/rcu/SRCU-P | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P new file mode 100644 index 000000000000..4b6f272dba27 --- /dev/null +++ b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | CONFIG_RCU_TRACE=n | ||
| 2 | CONFIG_SMP=y | ||
| 3 | CONFIG_NR_CPUS=8 | ||
| 4 | CONFIG_HOTPLUG_CPU=y | ||
| 5 | CONFIG_PREEMPT_NONE=n | ||
| 6 | CONFIG_PREEMPT_VOLUNTARY=n | ||
| 7 | CONFIG_PREEMPT=y | ||