diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-07 08:52:12 -0400 |
| commit | 2c5cb2770392fb9c5d8518688c8bc61986d70dc6 (patch) | |
| tree | b19210e709de6ee0d22b67ef605a569500cf1a18 /tools/testing/selftests/rcutorture/bin/functions.sh | |
| parent | cd979883b9ede90643e019f33cb317933eb867b4 (diff) | |
| parent | 683b6c6f82a60fabf47012581c2cfbf1b037ab95 (diff) | |
Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15
This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.
Conflicts:
drivers/xen/events/events_base.c
Diffstat (limited to 'tools/testing/selftests/rcutorture/bin/functions.sh')
| -rw-r--r-- | tools/testing/selftests/rcutorture/bin/functions.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/rcutorture/bin/functions.sh b/tools/testing/selftests/rcutorture/bin/functions.sh index 587561d7c035..9b17e810ddc3 100644 --- a/tools/testing/selftests/rcutorture/bin/functions.sh +++ b/tools/testing/selftests/rcutorture/bin/functions.sh | |||
| @@ -96,6 +96,7 @@ identify_qemu () { | |||
| 96 | echo qemu-system-ppc64 | 96 | echo qemu-system-ppc64 |
| 97 | else | 97 | else |
| 98 | echo Cannot figure out what qemu command to use! 1>&2 | 98 | echo Cannot figure out what qemu command to use! 1>&2 |
| 99 | echo file $1 output: $u | ||
| 99 | # Usually this will be one of /usr/bin/qemu-system-* | 100 | # Usually this will be one of /usr/bin/qemu-system-* |
| 100 | # Use RCU_QEMU_CMD environment variable or appropriate | 101 | # Use RCU_QEMU_CMD environment variable or appropriate |
| 101 | # argument to top-level script. | 102 | # argument to top-level script. |