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

[linux-2.6-microblaze.git] / arch / x86 / include / asm / uaccess.h

diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index bb21913..c82abd6 100644 (file)
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -586,7 +586,6 @@ extern void __cmpxchg_wrong_size(void)
 #define __user_atomic_cmpxchg_inatomic(uval, ptr, old, new, size)      \
 ({                                                                     \
        int __ret = 0;                                                  \
-       __typeof__(ptr) __uval = (uval);                                \
        __typeof__(*(ptr)) __old = (old);                               \
        __typeof__(*(ptr)) __new = (new);                               \
        __uaccess_begin_nospec();                                       \
@@ -662,7 +661,7 @@ extern void __cmpxchg_wrong_size(void)
                __cmpxchg_wrong_size();                                 \
        }                                                               \
        __uaccess_end();                                                \
-       *__uval = __old;                                                \
+       *(uval) = __old;                                                \
        __ret;                                                          \
 })