Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/bug.c b/lib/bug.c
index 300e41afbf97..f13daf435211 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -165,7 +165,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
                                (void *)bugaddr);
 
                 show_regs(regs);
-                add_taint(TAINT_WARN);
+                add_taint(BUG_GET_TAINT(bug));
                 return BUG_TRAP_TYPE_WARN;
         }