diff options
| author |   Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-04-14 19:12:36 -0700 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2017-06-08 08:25:25 -0700 |
| commit | 1dcf2806ec19f01abed8027377f69e5c45878838 (patch) | |
| tree | eafb5dcb3fbb9e143203d846b66f666e0fea57b7 /tools/testing/selftests/rcutorture/configs | |
| parent | rcuperf: Defer expedited/normal check to end of test (diff) | |
| download | linux-dev-1dcf2806ec19f01abed8027377f69e5c45878838.tar.xz linux-dev-1dcf2806ec19f01abed8027377f69e5c45878838.zip | |
rcuperf: Remove conflicting Kconfig options
The TREE and TREE54 rcuperf scenarios' Kconfig fragment files specified
conflicting values for CONFIG_RCU_TRACE. This commit therefore removes
the =n line in favor of the =y line.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Diffstat (limited to 'tools/testing/selftests/rcutorture/configs')
| -rw-r--r-- | tools/testing/selftests/rcutorture/configs/rcuperf/TREE | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/testing/selftests/rcutorture/configs/rcuperf/TREE b/tools/testing/selftests/rcutorture/configs/rcuperf/TREE index a312f671a29a..721cfda76ab2 100644 --- a/tools/testing/selftests/rcutorture/configs/rcuperf/TREE +++ b/tools/testing/selftests/rcutorture/configs/rcuperf/TREE @@ -7,7 +7,6 @@ CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_FULL=n CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n CONFIG_HIBERNATION=n diff --git a/tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 b/tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 index 985fb170d13c..7629f5dd73b2 100644 --- a/tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 +++ b/tools/testing/selftests/rcutorture/configs/rcuperf/TREE54 @@ -8,7 +8,6 @@ CONFIG_HZ_PERIODIC=n CONFIG_NO_HZ_IDLE=y CONFIG_NO_HZ_FULL=n CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n CONFIG_HOTPLUG_CPU=n CONFIG_SUSPEND=n CONFIG_HIBERNATION=n |