diff --git a/[refs] b/[refs] index f7f9862e5ee4..d58718ffca08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79c1cb7a8ca8f08cd78f7c5eebc85bbe937f5ad4 +refs/heads/master: 3dc5063786b273f1aee545844f6bd4e9651ebffe diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 7f8aaa291a4e..39592b5ce68a 100644 --- a/trunk/mm/slub.c +++ b/trunk/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(); }