mn10300: failing __get_user() and get_user() should zero

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / mn10300 / include / asm / uaccess.h

diff --git a/arch/mn10300/include/asm/uaccess.h b/arch/mn10300/include/asm/uaccess.h
index 780560b330d9ef9109a76b0210185f3bc178ca8e..b9855e4f0ccdb2ceeb0f8b9d549d2cc3fcb3ff96 100644 (file)
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
@@ -161,7 +161,7 @@ struct __large_struct { unsigned long buf[100]; };
 
 #define __get_user_check(x, ptr, size)                                 \
 ({                                                                     \
-       const __typeof__(ptr) __guc_ptr = (ptr);                        \
+       const __typeof__(*(ptr))* __guc_ptr = (ptr);                    \
        int _e;                                                         \
        if (likely(__access_ok((unsigned long) __guc_ptr, (size))))     \
                _e = __get_user_nocheck((x), __guc_ptr, (size));        \
@@ -181,6 +181,7 @@ struct __large_struct { unsigned long buf[100]; };
                "2:\n"                                          \
                "       .section        .fixup,\"ax\"\n"        \
                "3:\n\t"                                        \
+               "       mov             0,%1\n"                 \
                "       mov             %3,%0\n"                \
                "       jmp             2b\n"                   \
                "       .previous\n"                            \