1 files changed, 13 insertions, 19 deletions

diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index caa270165f86..be240cc4978d 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -357,11 +357,11 @@ static int __init setup_ktext(char *str)
                 cpulist_scnprintf(buf, sizeof(buf), &ktext_mask);
                 if (cpumask_weight(&ktext_mask) > 1) {
                         ktext_small = 1;
-                        pr_info("ktext: using caching neighborhood %s "
-                               "with small pages\n", buf);
+                        pr_info("ktext: using caching neighborhood %s with small pages\n",
+                                buf);
                 } else {
                         pr_info("ktext: caching on cpu %s with one huge page\n",
-                               buf);
+                                buf);
                 }
         }
 
@@ -413,19 +413,16 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
         int rc, i;
 
         if (ktext_arg_seen && ktext_hash) {
-                pr_warning("warning: \"ktext\" boot argument ignored"
-                           " if \"kcache_hash\" sets up text hash-for-home\n");
+                pr_warn("warning: \"ktext\" boot argument ignored if \"kcache_hash\" sets up text hash-for-home\n");
                 ktext_small = 0;
         }
 
         if (kdata_arg_seen && kdata_hash) {
-                pr_warning("warning: \"kdata\" boot argument ignored"
-                           " if \"kcache_hash\" sets up data hash-for-home\n");
+                pr_warn("warning: \"kdata\" boot argument ignored if \"kcache_hash\" sets up data hash-for-home\n");
         }
 
         if (kdata_huge && !hash_default) {
-                pr_warning("warning: disabling \"kdata=huge\"; requires"
-                          " kcache_hash=all or =allbutstack\n");
+                pr_warn("warning: disabling \"kdata=huge\"; requires kcache_hash=all or =allbutstack\n");
                 kdata_huge = 0;
         }
 
@@ -470,8 +467,8 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                                         pte[pte_ofs] = pfn_pte(pfn, prot);
                         } else {
                                 if (kdata_huge)
-                                        printk(KERN_DEBUG "pre-shattered huge"
-                                               " page at %#lx\n", address);
+                                        printk(KERN_DEBUG "pre-shattered huge page at %#lx\n",
+                                               address);
                                 for (pte_ofs = 0; pte_ofs < PTRS_PER_PTE;
                                      pfn++, pte_ofs++, address += PAGE_SIZE) {
                                         pgprot_t prot = init_pgprot(address);
@@ -501,8 +498,8 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                         pr_info("ktext: not using unavailable cpus %s\n", buf);
                 }
                 if (cpumask_empty(&ktext_mask)) {
-                        pr_warning("ktext: no valid cpus; caching on %d.\n",
-                                   smp_processor_id());
+                        pr_warn("ktext: no valid cpus; caching on %d\n",
+                                smp_processor_id());
                         cpumask_copy(&ktext_mask,
                                      cpumask_of(smp_processor_id()));
                 }
@@ -798,11 +795,9 @@ void __init mem_init(void)
 #ifdef CONFIG_HIGHMEM
         /* check that fixmap and pkmap do not overlap */
         if (PKMAP_ADDR(LAST_PKMAP-1) >= FIXADDR_START) {
-                pr_err("fixmap and kmap areas overlap"
-                       " - this will crash\n");
+                pr_err("fixmap and kmap areas overlap - this will crash\n");
                 pr_err("pkstart: %lxh pkend: %lxh fixstart %lxh\n",
-                       PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP-1),
-                       FIXADDR_START);
+                       PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP-1), FIXADDR_START);
                 BUG();
         }
 #endif
@@ -926,8 +921,7 @@ static void free_init_pages(char *what, unsigned long begin, unsigned long end)
         unsigned long addr = (unsigned long) begin;
 
         if (kdata_huge && !initfree) {
-                pr_warning("Warning: ignoring initfree=0:"
-                           " incompatible with kdata=huge\n");
+                pr_warn("Warning: ignoring initfree=0: incompatible with kdata=huge\n");
                 initfree = 1;
         }
         end = (end + PAGE_SIZE - 1) & PAGE_MASK;