Pull percpu-dtc into release branch

[pandora-kernel.git] / arch / m32r / lib / usercopy.c

diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
index 2d1dd21..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>
@@ -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)