Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[cascardo/linux.git] / arch / m32r / lib / usercopy.c

diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
index ce16bbe..82abd15 100644 (file)
--- a/arch/m32r/lib/usercopy.c
+++ b/arch/m32r/lib/usercopy.c
@@ -6,7 +6,6 @@
  * Copyright 1997 Linus Torvalds
  * Copyright 2001, 2002, 2004 Hirokazu Takata
  */
-#include <linux/config.h>
 #include <linux/prefetch.h>
 #include <linux/string.h>
 #include <linux/thread_info.h>
@@ -64,7 +63,7 @@ do {                                                                  \
                "       .balign 4\n"                                    \
                "       .long 0b,3b\n"                                  \
                ".previous"                                             \
-               : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1),   \
+               : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \
                  "=&r" (__d2)                                          \
                : "i"(-EFAULT), "0"(count), "1"(count), "3"(src),       \
                  "4"(dst)                                              \
@@ -101,7 +100,7 @@ do {                                                                        \
                "       .balign 4\n"                                    \
                "       .long 0b,3b\n"                                  \
                ".previous"                                             \
-               : "=r"(res), "=r"(count), "=&r" (__d0), "=&r" (__d1),   \
+               : "=&r"(res), "=&r"(count), "=&r" (__d0), "=&r" (__d1), \
                  "=&r" (__d2)                                          \
                : "i"(-EFAULT), "0"(count), "1"(count), "3"(src),       \
                  "4"(dst)                                              \
@@ -294,7 +293,7 @@ long strnlen_user(const char __user *s, long n)
                : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
                : "r0", "r1", "cbit");
 
-       /* NOTE: strnlen_user() algorism:
+       /* NOTE: strnlen_user() algorithm:
         * {
         *   char *p;
         *   for (p = s; n-- && *p != '\0'; ++p)
@@ -370,7 +369,7 @@ long strnlen_user(const char __user *s, long n)
                : "0" (n), "1" (s), "r" (n & 3), "r" (mask), "r"(0x01010101)
                : "r0", "r1", "r2", "r3", "cbit");
 
-       /* NOTE: strnlen_user() algorism:
+       /* NOTE: strnlen_user() algorithm:
         * {
         *   char *p;
         *   for (p = s; n-- && *p != '\0'; ++p)