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, 17 insertions, 20 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 30f01c6f6b88..42cf199652a5 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4074,8 +4074,7 @@ static int __parse_numa_zonelist_order(char *s)
                 user_zonelist_order = ZONELIST_ORDER_ZONE;
         } else {
                 printk(KERN_WARNING
-                        "Ignoring invalid numa_zonelist_order value:  "
-                        "%s\n", s);
+                       "Ignoring invalid numa_zonelist_order value:  %s\n", s);
                 return -EINVAL;
         }
         return 0;
@@ -4539,12 +4538,11 @@ void __ref build_all_zonelists(pg_data_t *pgdat, struct zone *zone)
         else
                 page_group_by_mobility_disabled = 0;
 
-        pr_info("Built %i zonelists in %s order, mobility grouping %s.  "
-                "Total pages: %ld\n",
-                        nr_online_nodes,
-                        zonelist_order_name[current_zonelist_order],
-                        page_group_by_mobility_disabled ? "off" : "on",
-                        vm_total_pages);
+        pr_info("Built %i zonelists in %s order, mobility grouping %s.  Total pages: %ld\n",
+                nr_online_nodes,
+                zonelist_order_name[current_zonelist_order],
+                page_group_by_mobility_disabled ? "off" : "on",
+                vm_total_pages);
 #ifdef CONFIG_NUMA
         pr_info("Policy zone: %s\n", zone_names[policy_zone]);
 #endif
@@ -6142,22 +6140,21 @@ void __init mem_init_print_info(const char *str)
 
 #undef  adj_init_size
 
-        pr_info("Memory: %luK/%luK available "
-               "(%luK kernel code, %luK rwdata, %luK rodata, "
-               "%luK init, %luK bss, %luK reserved, %luK cma-reserved"
+        pr_info("Memory: %luK/%luK available (%luK kernel code, %luK rwdata, %luK rodata, %luK init, %luK bss, %luK reserved, %luK cma-reserved"
 #ifdef  CONFIG_HIGHMEM
-               ", %luK highmem"
+                ", %luK highmem"
 #endif
-               "%s%s)\n",
-               nr_free_pages() << (PAGE_SHIFT-10), physpages << (PAGE_SHIFT-10),
-               codesize >> 10, datasize >> 10, rosize >> 10,
-               (init_data_size + init_code_size) >> 10, bss_size >> 10,
-               (physpages - totalram_pages - totalcma_pages) << (PAGE_SHIFT-10),
-               totalcma_pages << (PAGE_SHIFT-10),
+                "%s%s)\n",
+                nr_free_pages() << (PAGE_SHIFT - 10),
+                physpages << (PAGE_SHIFT - 10),
+                codesize >> 10, datasize >> 10, rosize >> 10,
+                (init_data_size + init_code_size) >> 10, bss_size >> 10,
+                (physpages - totalram_pages - totalcma_pages) << (PAGE_SHIFT - 10),
+                totalcma_pages << (PAGE_SHIFT - 10),
 #ifdef  CONFIG_HIGHMEM
-               totalhigh_pages << (PAGE_SHIFT-10),
+                totalhigh_pages << (PAGE_SHIFT - 10),
 #endif
-               str ? ", " : "", str ? str : "");
+                str ? ", " : "", str ? str : "");
 }
 
 /**