From 310d878eabe0ed51cd77df4eacc6648b873a71ad Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 15 Nov 2011 15:04:00 -0800
Subject: [PATCH] --- yaml --- r: 283405 b: refs/heads/master c:
 265d47e7115023df9e2b7a864b207b4738d9e18c h: refs/heads/master i:   283403:
 251d3fdeda1851160ab30a00f91f928d942db4ac v: v3

---
 [refs]          | 2 +-
 trunk/mm/slub.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a960374a100b..6ff9dd664394 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3df1cccdfb3fab6aa9176beb655d802eb384eabc
+refs/heads/master: 265d47e7115023df9e2b7a864b207b4738d9e18c
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 7d2a996c307e..60552d52f847 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -570,7 +570,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
 	va_end(args);
 	printk(KERN_ERR "========================================"
 			"=====================================\n");
-	printk(KERN_ERR "BUG %s: %s\n", s->name, buf);
+	printk(KERN_ERR "BUG %s (%s): %s\n", s->name, print_tainted(), buf);
 	printk(KERN_ERR "----------------------------------------"
 			"-------------------------------------\n\n");
 }