Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / tile / mm / hugetlbpage.c

diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
index e514899..3270e00 100644 (file)
--- a/arch/tile/mm/hugetlbpage.c
+++ b/arch/tile/mm/hugetlbpage.c
@@ -284,22 +284,21 @@ static __init int __setup_hugepagesz(unsigned long ps)
        int level, base_shift;
 
        if ((1UL << log_ps) != ps || (log_ps & 1) != 0) {
-               pr_warn("Not enabling %ld byte huge pages;"
-                       " must be a power of four.\n", ps);
+               pr_warn("Not enabling %ld byte huge pages; must be a power of four\n",
+                       ps);
                return -EINVAL;
        }
 
        if (ps > 64*1024*1024*1024UL) {
-               pr_warn("Not enabling %ld MB huge pages;"
-                       " largest legal value is 64 GB .\n", ps >> 20);
+               pr_warn("Not enabling %ld MB huge pages; largest legal value is 64 GB\n",
+                       ps >> 20);
                return -EINVAL;
        } else if (ps >= PUD_SIZE) {
                static long hv_jpage_size;
                if (hv_jpage_size == 0)
                        hv_jpage_size = hv_sysconf(HV_SYSCONF_PAGE_SIZE_JUMBO);
                if (hv_jpage_size != PUD_SIZE) {
-                       pr_warn("Not enabling >= %ld MB huge pages:"
-                               " hypervisor reports size %ld\n",
+                       pr_warn("Not enabling >= %ld MB huge pages: hypervisor reports size %ld\n",
                                PUD_SIZE >> 20, hv_jpage_size);
                        return -EINVAL;
                }
@@ -320,14 +319,13 @@ static __init int __setup_hugepagesz(unsigned long ps)
                int shift_val = log_ps - base_shift;
                if (huge_shift[level] != 0) {
                        int old_shift = base_shift + huge_shift[level];
-                       pr_warn("Not enabling %ld MB huge pages;"
-                               " already have size %ld MB.\n",
+                       pr_warn("Not enabling %ld MB huge pages; already have size %ld MB\n",
                                ps >> 20, (1UL << old_shift) >> 20);
                        return -EINVAL;
                }
                if (hv_set_pte_super_shift(level, shift_val) != 0) {
-                       pr_warn("Not enabling %ld MB huge pages;"
-                               " no hypervisor support.\n", ps >> 20);
+                       pr_warn("Not enabling %ld MB huge pages; no hypervisor support\n",
+                               ps >> 20);
                        return -EINVAL;
                }
                printk(KERN_DEBUG "Enabled %ld MB huge pages\n", ps >> 20);