From 2172bf0368b35a9b95e017675944da1230f9bf1f Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 15 Nov 2011 15:03:52 -0800
Subject: [PATCH] --- yaml --- r: 283406 b: refs/heads/master c:
 face37f5e615646f364fa848f0a5c9d361d7a46e h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6ff9dd664394..5be2366df37b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 265d47e7115023df9e2b7a864b207b4738d9e18c
+refs/heads/master: face37f5e615646f364fa848f0a5c9d361d7a46e
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index b0414d12fd08..a7f9c244aac6 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -1941,8 +1941,8 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
 			/* Print header */
 			if (lines == 0) {
 				printk(KERN_ERR
-					"Slab corruption: %s start=%p, len=%d\n",
-					cachep->name, realobj, size);
+					"Slab corruption (%s): %s start=%p, len=%d\n",
+					print_tainted(), cachep->name, realobj, size);
 				print_objinfo(cachep, objp, 0);
 			}
 			/* Hexdump the affected line */
@@ -3051,8 +3051,9 @@ static void check_slabp(struct kmem_cache *cachep, struct slab *slabp)
 	if (entries != cachep->num - slabp->inuse) {
 bad:
 		printk(KERN_ERR "slab: Internal list corruption detected in "
-				"cache '%s'(%d), slabp %p(%d). Hexdump:\n",
-			cachep->name, cachep->num, slabp, slabp->inuse);
+			"cache '%s'(%d), slabp %p(%d). Tainted(%s). Hexdump:\n",
+			cachep->name, cachep->num, slabp, slabp->inuse,
+			print_tainted());
 		print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 16, 1, slabp,
 			sizeof(*slabp) + cachep->num * sizeof(kmem_bufctl_t),
 			1);