diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-31 00:15:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-31 00:15:53 +0200 |
| commit | c1cc4784ce6e8cceff1013709abd74bcbf7fbf24 (patch) | |
| tree | 5eaacf62240ec85a6ad9c7594e8ad8f7f783afc2 /tools/testing/selftests/rcutorture/bin/configinit.sh | |
| parent | 92ed301919932f777713b9172e525674157e983d (diff) | |
| parent | 13625c0a4074d3bab61b1dc70a828b574255f339 (diff) | |
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcucore-rcu-2020-08-03
Pull the v5.9 RCU bits from Paul E. McKenney:
- Documentation updates
- Miscellaneous fixes
- kfree_rcu updates
- RCU tasks updates
- Read-side scalability tests
- SRCU updates
- Torture-test updates
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/configinit.sh')
| -rwxr-xr-x | tools/testing/selftests/rcutorture/bin/configinit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/configinit.sh b/tools/testing/selftests/rcutorture/bin/configinit.sh index 93e80a42249a..d6e5ce084b1c 100755 --- a/tools/testing/selftests/rcutorture/bin/configinit.sh +++ b/tools/testing/selftests/rcutorture/bin/configinit.sh @@ -32,11 +32,11 @@ if test -z "$TORTURE_TRUST_MAKE" then make clean > $resdir/Make.clean 2>&1 fi -make $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1 +make $TORTURE_KMAKE_ARG $TORTURE_DEFCONFIG > $resdir/Make.defconfig.out 2>&1 mv .config .config.sav sh $T/upd.sh < .config.sav > .config cp .config .config.new -yes '' | make oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err +yes '' | make $TORTURE_KMAKE_ARG oldconfig > $resdir/Make.oldconfig.out 2> $resdir/Make.oldconfig.err # verify new config matches specification. configcheck.sh .config $c |