2 files changed, 11 insertions, 1 deletions

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index f81c8b3a39a..62a134dc421 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -104,6 +104,7 @@ my $start_minconfig;
 my $start_minconfig_defined;
 my $output_minconfig;
 my $ignore_config;
+my $ignore_errors;
 my $addconfig;
 my $in_bisect = 0;
 my $bisect_bad_commit = "";
@@ -218,6 +219,7 @@ my %option_map = (
     "BISECT_SLEEP_TIME"         => \$bisect_sleep_time,
     "PATCHCHECK_SLEEP_TIME"     => \$patchcheck_sleep_time,
     "IGNORE_WARNINGS"           => \$ignore_warnings,
+    "IGNORE_ERRORS"             => \$ignore_errors,
     "BISECT_MANUAL"             => \$bisect_manual,
     "BISECT_SKIP"               => \$bisect_skip,
     "CONFIG_BISECT_GOOD"        => \$config_bisect_good,
@@ -1529,7 +1531,7 @@ sub monitor {
         }
 
         if ($full_line =~ /call trace:/i) {
-            if (!$bug && !$skip_call_trace) {
+            if (!$ignore_errors && !$bug && !$skip_call_trace) {
                 $bug = 1;
                 $failure_start = time;
             }
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index d7148f7c7c0..e7119024b87 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -741,6 +741,14 @@
 # (default 0)
 #IGNORE_UNUSED = 1
 
+# When testing a kernel that happens to have WARNINGs, and call
+# traces, ktest.pl will detect these and fail a boot or test run
+# due to warnings. By setting this option, ktest will ignore
+# call traces, and will not fail a test if the kernel produces
+# an oops. Use this option with care.
+# (default 0)
+#IGNORE_ERRORS = 1
+
 #### Per test run options ####
 # The following options are only allowed in TEST_START sections.
 # They are ignored in the DEFAULTS sections.