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, 3 insertions, 5 deletions

diff --git a/mm/mmap.c b/mm/mmap.c
index 14641926c97f..e06345aafa03 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2517,9 +2517,8 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
         unsigned long ret = -EINVAL;
         struct file *file;
 
-        pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. "
-                        "See Documentation/vm/remap_file_pages.txt.\n",
-                        current->comm, current->pid);
+        pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
+                     current->comm, current->pid);
 
         if (prot)
                 return ret;
@@ -2885,8 +2884,7 @@ bool may_expand_vm(struct mm_struct *mm, vm_flags_t flags, unsigned long npages)
         if (is_data_mapping(flags) &&
             mm->data_vm + npages > rlimit(RLIMIT_DATA) >> PAGE_SHIFT) {
                 if (ignore_rlimit_data)
-                        pr_warn_once("%s (%d): VmData %lu exceed data ulimit "
-                                     "%lu. Will be forbidden soon.\n",
+                        pr_warn_once("%s (%d): VmData %lu exceed data ulimit %lu. Will be forbidden soon.\n",
                                      current->comm, current->pid,
                                      (mm->data_vm + npages) << PAGE_SHIFT,
                                      rlimit(RLIMIT_DATA));