aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-04-23 15:28:01 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-23 15:47:48 -0400
commit3dc5063786b273f1aee545844f6bd4e9651ebffe (patch)
tree18324d6e3b46a3c94aeec16d59f3f55e940625ea
parent79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4 (diff)
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>
-rw-r--r--mm/slub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 7f8aaa291a4e..39592b5ce68a 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)
521static void object_err(struct kmem_cache *s, struct page *page, 521static void object_err(struct kmem_cache *s, struct page *page,
522 u8 *object, char *reason) 522 u8 *object, char *reason)
523{ 523{
524 slab_bug(s, reason); 524 slab_bug(s, "%s", reason);
525 print_trailer(s, page, object); 525 print_trailer(s, page, object);
526} 526}
527 527
@@ -533,7 +533,7 @@ static void slab_err(struct kmem_cache *s, struct page *page, char *fmt, ...)
533 va_start(args, fmt); 533 va_start(args, fmt);
534 vsnprintf(buf, sizeof(buf), fmt, args); 534 vsnprintf(buf, sizeof(buf), fmt, args);
535 va_end(args); 535 va_end(args);
536 slab_bug(s, fmt); 536 slab_bug(s, "%s", buf);
537 print_page_info(page); 537 print_page_info(page);
538 dump_stack(); 538 dump_stack();
539} 539}