diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-03-12 15:44:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-03-12 15:44:11 -0400 |
commit | 35239e23c66f1614c76739b62a299c3c92d6eb68 (patch) | |
tree | 7b1e068df888ec9a00b43c1dd7517a6490da6a94 /tools | |
parent | 3f33ab1c0c741bfab2138c14ba1918a7905a1e8b (diff) | |
parent | 87e24f4b67e68d9fd8df16e0bf9c66d1ad2a2533 (diff) |
Merge branch 'perf/urgent' into perf/core
Merge reason: We are going to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/testing/ktest/ktest.pl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 62a134dc421a..9507c4b251a8 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
@@ -3244,9 +3244,11 @@ sub make_min_config { | |||
3244 | $in_bisect = 1; | 3244 | $in_bisect = 1; |
3245 | 3245 | ||
3246 | my $failed = 0; | 3246 | my $failed = 0; |
3247 | build "oldconfig"; | 3247 | build "oldconfig" or $failed = 1; |
3248 | start_monitor_and_boot or $failed = 1; | 3248 | if (!$failed) { |
3249 | end_monitor; | 3249 | start_monitor_and_boot or $failed = 1; |
3250 | end_monitor; | ||
3251 | } | ||
3250 | 3252 | ||
3251 | $in_bisect = 0; | 3253 | $in_bisect = 0; |
3252 | 3254 | ||