Merge git://git.infradead.org/~dwmw2/firmware-2.6

[sfrench/cifs-2.6.git] / arch / m68k / lib / uaccess.c

diff --git a/arch/m68k/lib/uaccess.c b/arch/m68k/lib/uaccess.c
index 1bc188c0d983c55db9afbd52313444b73acb40b5..13854ed8cd9ad226497e5ab6fe79d4636138a7a9 100644 (file)
--- a/arch/m68k/lib/uaccess.c
+++ b/arch/m68k/lib/uaccess.c
@@ -84,7 +84,7 @@ unsigned long __generic_copy_to_user(void __user *to, const void *from,
                "       .even\n"
                "20:    lsl.l   #2,%0\n"
                "50:    add.l   %5,%0\n"
-               "       jra     7b\n"
+               "       jra     8b\n"
                "       .previous\n"
                "\n"
                "       .section __ex_table,\"a\"\n"
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(strnlen_user);
  * Zero Userspace
  */
 
-unsigned long clear_user(void __user *to, unsigned long n)
+unsigned long __clear_user(void __user *to, unsigned long n)
 {
        unsigned long res;
 
@@ -219,4 +219,4 @@ unsigned long clear_user(void __user *to, unsigned long n)
 
     return res;
 }
-EXPORT_SYMBOL(clear_user);
+EXPORT_SYMBOL(__clear_user);