Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d2ebf7eea0d3fd450ca5b1cb2243fe1d69d399ce

Authored by Paul E. McKenney
1 parent a1be00d953
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

rcutorture: Create CFcommon file for common Kconfig parameters 

Currently, CONFIG_RCU_TORTURE_TEST=y is hardcoded into the
kvm-test-1-rcu.sh script and CONFIG_PRINTK_TIME=y is mentioned in each
and every configs file.  This commit creates a CFcommon file for these
two Kconfig parameters, and modifies kvm-test-1-rcu.sh to copy this new
file into the .config file during the build.  This change will allow
these scripts to operate on torture types other than just rcutorture.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>

Showing 17 changed files with 7 additions and 18 deletions Side-by-side Diff

tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh
Diff comments   View file @ d2ebf7e
... ... @@ -47,6 +47,7 @@
47 47 . $KVPATH/ver_functions.sh
48 48  
49 49 config_template=${1}
  50 +config_dir=`echo $config_template | sed -e 's,/[^/]*$,,'`
50 51 title=`echo $config_template | sed -e 's/^.*\///'`
51 52 builddir=${2}
52 53 if test -z "$builddir" -o ! -d "$builddir" -o ! -w "$builddir"
... ... @@ -63,9 +64,10 @@
63 64 cp $config_template $resdir/ConfigFragment
64 65 echo ' ---' `date`: Starting build
65 66 echo ' ---' Kconfig fragment at: $config_template >> $resdir/log
66   -cat << '___EOF___' >> $T
67   -CONFIG_RCU_TORTURE_TEST=y
68   -___EOF___
  67 +if test -r "$config_dir/CFcommon"
  68 +then
  69 + cat < $config_dir/CFcommon >> $T
  70 +fi
69 71 # Optimizations below this point
70 72 # CONFIG_USB=n
71 73 # CONFIG_SECURITY=n
tools/testing/selftests/rcutorture/configs/BUSTED
Diff comments   View file @ d2ebf7e
... ... @@ -5,5 +5,4 @@
5 5 CONFIG_PREEMPT_NONE=n
6 6 CONFIG_PREEMPT_VOLUNTARY=n
7 7 CONFIG_PREEMPT=y
8   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/CFcommon
Diff comments   View file @ d2ebf7e
  1 +CONFIG_RCU_TORTURE_TEST=y
  2 +CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/SRCU-N
Diff comments   View file @ d2ebf7e
... ... @@ -5,5 +5,4 @@
5 5 CONFIG_PREEMPT_NONE=y
6 6 CONFIG_PREEMPT_VOLUNTARY=n
7 7 CONFIG_PREEMPT=n
8   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/SRCU-P
Diff comments   View file @ d2ebf7e
... ... @@ -5,5 +5,4 @@
5 5 CONFIG_PREEMPT_NONE=n
6 6 CONFIG_PREEMPT_VOLUNTARY=n
7 7 CONFIG_PREEMPT=y
8   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TINY01
Diff comments   View file @ d2ebf7e
... ... @@ -10,5 +10,4 @@
10 10 CONFIG_DEBUG_LOCK_ALLOC=n
11 11 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
12 12 CONFIG_PREEMPT_COUNT=n
13   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TINY02
Diff comments   View file @ d2ebf7e
... ... @@ -10,5 +10,4 @@
10 10 CONFIG_DEBUG_LOCK_ALLOC=y
11 11 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
12 12 CONFIG_PREEMPT_COUNT=y
13   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE01
Diff comments   View file @ d2ebf7e
... ... @@ -20,5 +20,4 @@
20 20 CONFIG_RCU_CPU_STALL_VERBOSE=n
21 21 CONFIG_RCU_BOOST=n
22 22 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
23   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE02
Diff comments   View file @ d2ebf7e
... ... @@ -23,5 +23,4 @@
23 23 CONFIG_RCU_CPU_STALL_VERBOSE=y
24 24 CONFIG_RCU_BOOST=n
25 25 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
26   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE03
Diff comments   View file @ d2ebf7e
... ... @@ -20,5 +20,4 @@
20 20 CONFIG_RCU_BOOST=y
21 21 CONFIG_RCU_BOOST_PRIO=2
22 22 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
23   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE04
Diff comments   View file @ d2ebf7e
... ... @@ -22,5 +22,4 @@
22 22 CONFIG_RCU_CPU_STALL_INFO=y
23 23 CONFIG_RCU_CPU_STALL_VERBOSE=y
24 24 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
25   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE05
Diff comments   View file @ d2ebf7e
... ... @@ -22,5 +22,4 @@
22 22 CONFIG_RCU_CPU_STALL_INFO=n
23 23 CONFIG_RCU_CPU_STALL_VERBOSE=n
24 24 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
25   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE06
Diff comments   View file @ d2ebf7e
... ... @@ -23,5 +23,4 @@
23 23 CONFIG_RCU_CPU_STALL_INFO=n
24 24 CONFIG_RCU_CPU_STALL_VERBOSE=n
25 25 CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
26   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE07
Diff comments   View file @ d2ebf7e
... ... @@ -21,5 +21,4 @@
21 21 CONFIG_RCU_CPU_STALL_INFO=y
22 22 CONFIG_RCU_CPU_STALL_VERBOSE=n
23 23 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
24   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE08
Diff comments   View file @ d2ebf7e
... ... @@ -23,5 +23,4 @@
23 23 CONFIG_RCU_CPU_STALL_VERBOSE=n
24 24 CONFIG_RCU_BOOST=n
25 25 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
26   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE08-T
Diff comments   View file @ d2ebf7e
... ... @@ -23,5 +23,4 @@
23 23 CONFIG_RCU_CPU_STALL_VERBOSE=n
24 24 CONFIG_RCU_BOOST=n
25 25 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
26   -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE09
Diff comments   View file @ d2ebf7e
... ... @@ -18,5 +18,4 @@
18 18 CONFIG_RCU_CPU_STALL_VERBOSE=n
19 19 CONFIG_RCU_BOOST=n
20 20 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
21   -CONFIG_PRINTK_TIME=y