diff options
author | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
---|---|---|
committer | Neil Brown <neilb@notabene.brown> | 2008-07-08 10:11:50 +1000 |
commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
tree | a1f22225aace571661c29e59ebd024bc4619e054 /lib/bug.c | |
parent | 1fe797e67fb07d605b82300934d0de67068a0aca (diff) | |
parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) |
Merge branch 'master' into for-next
Diffstat (limited to 'lib/bug.c')
-rw-r--r-- | lib/bug.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bug.c b/lib/bug.c index 530f38f5578..bfeafd60ee9 100644 --- a/lib/bug.c +++ b/lib/bug.c @@ -37,6 +37,7 @@ */ #include <linux/list.h> #include <linux/module.h> +#include <linux/kernel.h> #include <linux/bug.h> #include <linux/sched.h> @@ -149,6 +150,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) (void *)bugaddr); show_regs(regs); + add_taint(TAINT_WARN); return BUG_TRAP_TYPE_WARN; } |