Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

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

diff --git a/arch/microblaze/include/asm/uaccess.h b/arch/microblaze/include/asm/uaccess.h
index ef25f7538d4a04090180c1062b5d1c965d06156e..927540d3cb7d1ee9ddb62a6b1b0915f758dc8761 100644 (file)
--- a/arch/microblaze/include/asm/uaccess.h
+++ b/arch/microblaze/include/asm/uaccess.h
@@ -298,11 +298,10 @@ extern long __user_bad(void);
 
 #define __put_user_check(x, ptr, size)                                 \
 ({                                                                     \
-       typeof(*(ptr)) __pu_val;                                        \
+       typeof(*(ptr)) volatile __pu_val = x;                                   \
        typeof(*(ptr)) __user *__pu_addr = (ptr);                       \
        int __pu_err = 0;                                               \
                                                                        \
-       __pu_val = (x);                                                 \
        if (access_ok(VERIFY_WRITE, __pu_addr, size)) {                 \
                switch (size) {                                         \
                case 1:                                                 \