From: Christoph Lameter <clameter@sgi.com>
Date: Wed, 23 Apr 2008 19:28:01 +0000 (-0700)
Subject: slab_err: Pass parameters correctly to slab_bug
X-Git-Tag: v2.6.26-rc1~1093
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3dc5063786b273f1aee545844f6bd4e9651ebffe;p=linux-2.6-omap-h63xx.git

slab_err: Pass parameters correctly to slab_bug

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/mm/slub.c b/mm/slub.c
index 7f8aaa291a4..39592b5ce68 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -521,7 +521,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
 static void object_err(struct kmem_cache *s, struct page *page,
 			u8 *object, char *reason)
 {
-	slab_bug(s, reason);
+	slab_bug(s, "%s", reason);
 	print_trailer(s, page, object);
 }
 
@@ -533,7 +533,7 @@ static void slab_err(struct kmem_cache *s, struct page *page, char *fmt, ...)
 	va_start(args, fmt);
 	vsnprintf(buf, sizeof(buf), fmt, args);
 	va_end(args);
-	slab_bug(s, fmt);
+	slab_bug(s, "%s", buf);
 	print_page_info(page);
 	dump_stack();
 }