mm: coalesce split strings

Kernel style prefers a single string over split strings when the string is
'user-visible'.

Miscellanea:

 - Add a missing newline
 - Realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Tejun Heo <tj@kernel.org>	[percpu]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 9 insertions, 10 deletions

diff --git a/mm/slub.c b/mm/slub.c
index 64ed5f3a3046..7277413ebc8b 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -950,14 +950,14 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search)
                 max_objects = MAX_OBJS_PER_PAGE;
 
         if (page->objects != max_objects) {
-                slab_err(s, page, "Wrong number of objects. Found %d but "
-                        "should be %d", page->objects, max_objects);
+                slab_err(s, page, "Wrong number of objects. Found %d but should be %d",
+                         page->objects, max_objects);
                 page->objects = max_objects;
                 slab_fix(s, "Number of objects adjusted.");
         }
         if (page->inuse != page->objects - nr) {
-                slab_err(s, page, "Wrong object count. Counter is %d but "
-                        "counted were %d", page->inuse, page->objects - nr);
+                slab_err(s, page, "Wrong object count. Counter is %d but counted were %d",
+                         page->inuse, page->objects - nr);
                 page->inuse = page->objects - nr;
                 slab_fix(s, "Object count adjusted.");
         }
@@ -1117,8 +1117,8 @@ static inline int free_consistency_checks(struct kmem_cache *s,
 
         if (unlikely(s != page->slab_cache)) {
                 if (!PageSlab(page)) {
-                        slab_err(s, page, "Attempt to free object(0x%p) "
-                                "outside of slab", object);
+                        slab_err(s, page, "Attempt to free object(0x%p) outside of slab",
+                                 object);
                 } else if (!page->slab_cache) {
                         pr_err("SLUB <none>: no slab for object 0x%p.\n",
                                object);
@@ -3439,10 +3439,9 @@ static int kmem_cache_open(struct kmem_cache *s, unsigned long flags)
         free_kmem_cache_nodes(s);
 error:
         if (flags & SLAB_PANIC)
-                panic("Cannot create slab %s size=%lu realsize=%u "
-                        "order=%u offset=%u flags=%lx\n",
-                        s->name, (unsigned long)s->size, s->size,
-                        oo_order(s->oo), s->offset, flags);
+                panic("Cannot create slab %s size=%lu realsize=%u order=%u offset=%u flags=%lx\n",
+                      s->name, (unsigned long)s->size, s->size,
+                      oo_order(s->oo), s->offset, flags);
         return -EINVAL;
 }