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, 8 insertions, 10 deletions

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index a81cd76ea282..e6429926e957 100644
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -596,8 +596,7 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size,
                 else if (parent->pointer + parent->size <= ptr)
                         link = &parent->rb_node.rb_right;
                 else {
-                        kmemleak_stop("Cannot insert 0x%lx into the object "
-                                      "search tree (overlaps existing)\n",
+                        kmemleak_stop("Cannot insert 0x%lx into the object search tree (overlaps existing)\n",
                                       ptr);
                         /*
                          * No need for parent->lock here since "parent" cannot
@@ -670,8 +669,8 @@ static void delete_object_part(unsigned long ptr, size_t size)
         object = find_and_remove_object(ptr, 1);
         if (!object) {
 #ifdef DEBUG
-                kmemleak_warn("Partially freeing unknown object at 0x%08lx "
-                              "(size %zu)\n", ptr, size);
+                kmemleak_warn("Partially freeing unknown object at 0x%08lx (size %zu)\n",
+                              ptr, size);
 #endif
                 return;
         }
@@ -717,8 +716,8 @@ static void paint_ptr(unsigned long ptr, int color)
 
         object = find_and_get_object(ptr, 0);
         if (!object) {
-                kmemleak_warn("Trying to color unknown object "
-                              "at 0x%08lx as %s\n", ptr,
+                kmemleak_warn("Trying to color unknown object at 0x%08lx as %s\n",
+                              ptr,
                               (color == KMEMLEAK_GREY) ? "Grey" :
                               (color == KMEMLEAK_BLACK) ? "Black" : "Unknown");
                 return;
@@ -1463,8 +1462,8 @@ static void kmemleak_scan(void)
         if (new_leaks) {
                 kmemleak_found_leaks = true;
 
-                pr_info("%d new suspected memory leaks (see "
-                        "/sys/kernel/debug/kmemleak)\n", new_leaks);
+                pr_info("%d new suspected memory leaks (see /sys/kernel/debug/kmemleak)\n",
+                        new_leaks);
         }
 
 }
@@ -1795,8 +1794,7 @@ static void kmemleak_do_cleanup(struct work_struct *work)
         if (!kmemleak_found_leaks)
                 __kmemleak_do_cleanup();
         else
-                pr_info("Kmemleak disabled without freeing internal data. "
-                        "Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\"\n");
+                pr_info("Kmemleak disabled without freeing internal data. Reclaim the memory with \"echo clear > /sys/kernel/debug/kmemleak\".\n");
 }
 
 static DECLARE_WORK(cleanup_work, kmemleak_do_cleanup);