From 171a5ba28b3e3714b25b3a298215bc0d0c8dc256 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 18 Sep 2012 15:54:12 -0400
Subject: [PATCH] --- yaml --- r: 330420 b: refs/heads/master c:
 645df230cacc48f4463037016e9dbd3633183fe8 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/mm/slab.c | 1 +
 trunk/mm/slub.c | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1aacea67cfd5..e4047c2c60e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 947ca1856a7e60aa6d20536785e6a42dff25aa6e
+refs/heads/master: 645df230cacc48f4463037016e9dbd3633183fe8
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index cd5a92650303..5c6abb831e6a 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -811,6 +811,7 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
 	printk(KERN_ERR "slab error in %s(): cache `%s': %s\n",
 	       function, cachep->name, msg);
 	dump_stack();
+	add_taint(TAINT_BAD_PAGE);
 }
 
 /*
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index c67bd0a4a952..a6d043e13266 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -568,6 +568,8 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
 	printk(KERN_ERR "BUG %s (%s): %s\n", s->name, print_tainted(), buf);
 	printk(KERN_ERR "----------------------------------------"
 			"-------------------------------------\n\n");
+
+	add_taint(TAINT_BAD_PAGE);
 }
 
 static void slab_fix(struct kmem_cache *s, char *fmt, ...)