Linux 3.14

[~andy/linux] / lib / bug.c

diff --git a/lib/bug.c b/lib/bug.c
index d0cdf14c651ae629cba6731debb3b6a5edee39bf..168603477f02889f13fd7119cc55f5e325b08ff9 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -166,7 +166,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                print_modules();
                show_regs(regs);
                print_oops_end_marker();
-               add_taint(BUG_GET_TAINT(bug));
+               /* Just a warning, don't kill lockdep. */
+               add_taint(BUG_GET_TAINT(bug), LOCKDEP_STILL_OK);
                return BUG_TRAP_TYPE_WARN;
        }