Skip to content

Commit 9f8ba55

Browse files
committed
rcutorture: Remove CONFIG_HOTPLUG_CPU=n from scenarios
A number of mainstream CPU families are no longer capable of building kernels having CONFIG_SMP=y and CONFIG_HOTPLUG_CPU=n, so this commit removes this combination from the rcutorture scenarios having it. People wishing to try out this combination may still do so using the "--kconfig CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n CONFIG_HIBERNATION=n" argument to the tools/testing/selftests/rcutorture/bin/kvm.sh script that is used to run rcutorture. Signed-off-by: Paul E. McKenney <[email protected]>
1 parent c5d3c8c commit 9f8ba55

File tree

8 files changed

+0
-22
lines changed

8 files changed

+0
-22
lines changed

tools/testing/selftests/rcutorture/configs/rcu/TASKS03

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
CONFIG_SMP=y
22
CONFIG_NR_CPUS=2
3-
CONFIG_HOTPLUG_CPU=n
4-
CONFIG_SUSPEND=n
5-
CONFIG_HIBERNATION=n
63
CONFIG_PREEMPT_NONE=n
74
CONFIG_PREEMPT_VOLUNTARY=n
85
CONFIG_PREEMPT=y

tools/testing/selftests/rcutorture/configs/rcu/TREE02

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_NO_HZ_IDLE=y
99
CONFIG_NO_HZ_FULL=n
1010
CONFIG_RCU_FAST_NO_HZ=n
1111
CONFIG_RCU_TRACE=n
12-
CONFIG_HOTPLUG_CPU=n
13-
CONFIG_SUSPEND=n
14-
CONFIG_HIBERNATION=n
1512
CONFIG_RCU_FANOUT=3
1613
CONFIG_RCU_FANOUT_LEAF=3
1714
CONFIG_RCU_NOCB_CPU=n

tools/testing/selftests/rcutorture/configs/rcu/TREE04

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_NO_HZ_IDLE=n
99
CONFIG_NO_HZ_FULL=y
1010
CONFIG_RCU_FAST_NO_HZ=y
1111
CONFIG_RCU_TRACE=y
12-
CONFIG_HOTPLUG_CPU=n
13-
CONFIG_SUSPEND=n
14-
CONFIG_HIBERNATION=n
1512
CONFIG_RCU_FANOUT=4
1613
CONFIG_RCU_FANOUT_LEAF=3
1714
CONFIG_DEBUG_LOCK_ALLOC=n

tools/testing/selftests/rcutorture/configs/rcu/TREE06

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_NO_HZ_IDLE=y
99
CONFIG_NO_HZ_FULL=n
1010
CONFIG_RCU_FAST_NO_HZ=n
1111
CONFIG_RCU_TRACE=n
12-
CONFIG_HOTPLUG_CPU=n
13-
CONFIG_SUSPEND=n
14-
CONFIG_HIBERNATION=n
1512
CONFIG_RCU_FANOUT=6
1613
CONFIG_RCU_FANOUT_LEAF=6
1714
CONFIG_RCU_NOCB_CPU=n

tools/testing/selftests/rcutorture/configs/rcu/TREE08

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CONFIG_NO_HZ_IDLE=y
99
CONFIG_NO_HZ_FULL=n
1010
CONFIG_RCU_FAST_NO_HZ=n
1111
CONFIG_RCU_TRACE=n
12-
CONFIG_HOTPLUG_CPU=n
13-
CONFIG_SUSPEND=n
14-
CONFIG_HIBERNATION=n
1512
CONFIG_RCU_FANOUT=3
1613
CONFIG_RCU_FANOUT_LEAF=2
1714
CONFIG_RCU_NOCB_CPU=y

tools/testing/selftests/rcutorture/configs/rcu/TREE09

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ CONFIG_HZ_PERIODIC=n
88
CONFIG_NO_HZ_IDLE=y
99
CONFIG_NO_HZ_FULL=n
1010
CONFIG_RCU_TRACE=n
11-
CONFIG_HOTPLUG_CPU=n
12-
CONFIG_SUSPEND=n
13-
CONFIG_HIBERNATION=n
1411
CONFIG_RCU_NOCB_CPU=n
1512
CONFIG_DEBUG_LOCK_ALLOC=n
1613
CONFIG_RCU_BOOST=n

tools/testing/selftests/rcutorture/configs/rcu/TRIVIAL

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ CONFIG_PREEMPT=n
66
CONFIG_HZ_PERIODIC=n
77
CONFIG_NO_HZ_IDLE=y
88
CONFIG_NO_HZ_FULL=n
9-
CONFIG_HOTPLUG_CPU=n
10-
CONFIG_SUSPEND=n
11-
CONFIG_HIBERNATION=n
129
CONFIG_DEBUG_LOCK_ALLOC=n
1310
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
1411
CONFIG_RCU_EXPERT=y

tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Kconfig Parameters:
66

77
CONFIG_DEBUG_LOCK_ALLOC -- Do three, covering CONFIG_PROVE_LOCKING & not.
88
CONFIG_DEBUG_OBJECTS_RCU_HEAD -- Do one.
9-
CONFIG_HOTPLUG_CPU -- Do half. (Every second.)
109
CONFIG_HZ_PERIODIC -- Do one.
1110
CONFIG_NO_HZ_IDLE -- Do those not otherwise specified. (Groups of two.)
1211
CONFIG_NO_HZ_FULL -- Do two, one with partial CPU enablement.

0 commit comments

Comments
 (0)