Update from upstream with manual merge of Yasunori Goto's

[karo-tx-linux.git] / include / asm-um / uaccess.h

diff --git a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h
index 801710d00a404ec6dd175714a9e074789ffe158e..2ee028b8de9df8f74edeb1c67b1f4375c3ae82b1 100644 (file)
--- a/include/asm-um/uaccess.h
+++ b/include/asm-um/uaccess.h
@@ -44,7 +44,7 @@
         const __typeof__(ptr) __private_ptr = ptr; \
         __typeof__(*(__private_ptr)) __private_val; \
         int __private_ret = -EFAULT; \
-        (x) = 0; \
+        (x) = (__typeof__(*(__private_ptr)))0; \
        if (__copy_from_user(&__private_val, (__private_ptr), \
            sizeof(*(__private_ptr))) == 0) {\
                (x) = (__typeof__(*(__private_ptr))) __private_val; \