diff options
author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /tools/testing/ktest | |
parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'tools/testing/ktest')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 0d7fd8b51544..999eab1bc64f 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
@@ -1796,7 +1796,7 @@ sub monitor { | |||
1796 | # We already booted into the kernel we are testing, | 1796 | # We already booted into the kernel we are testing, |
1797 | # but now we booted into another kernel? | 1797 | # but now we booted into another kernel? |
1798 | # Consider this a triple fault. | 1798 | # Consider this a triple fault. |
1799 | doprint "Aleady booted in Linux kernel $version, but now\n"; | 1799 | doprint "Already booted in Linux kernel $version, but now\n"; |
1800 | doprint "we booted into Linux kernel $1.\n"; | 1800 | doprint "we booted into Linux kernel $1.\n"; |
1801 | doprint "Assuming that this is a triple fault.\n"; | 1801 | doprint "Assuming that this is a triple fault.\n"; |
1802 | doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n"; | 1802 | doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n"; |