summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-04-07 13:48:41 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2017-04-07 13:48:43 +1000
commit1980d677d200c670ec4ad0b98ffd26c64043168a (patch)
tree1ee1b887fa3346d46df9fd9431531ce5c8e7ef7a /tools
parent4b0539027be7ee4572f8e16611c3624a2a4db6a7 (diff)
parentac70aaf7267015bf4b642bb576857ed7395a001f (diff)
downloadlinux-next-1980d677d200c670ec4ad0b98ffd26c64043168a.tar.gz
Merge remote-tracking branch 'rcu/rcu/next'
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index ea6e373edc27..93eede4e8fbe 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -170,7 +170,7 @@ qemu_append="`identify_qemu_append "$QEMU"`"
# Pull in Kconfig-fragment boot parameters
boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
# Generate kernel-version-specific boot parameters
-boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
+boot_args="`per_version_boot_params "$boot_args" $resdir/.config $seconds`"
if test -n "$TORTURE_BUILDONLY"
then