Powerpc KVM work is based on a commit after rc4.

Merging master into next to satisfy the dependencies.

Conflicts:
	arch/arm/kvm/reset.c

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index edb3d5c73a32..7ecc2b23882e 100644
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -166,9 +166,10 @@ do {									\
 
 #define get_user(x, ptr)                                                \
 ({                                                                      \
+        __typeof__(*(ptr)) __user *__p = (ptr);                         \
         might_fault();                                                  \
-        access_ok(VERIFY_READ, (ptr), sizeof(*(ptr))) ?                 \
-                __get_user((x), (ptr)) :                                \
+        access_ok(VERIFY_READ, __p, sizeof(*__p)) ?                     \
+                __get_user((x), __p) :                                  \
                 ((x) = 0, -EFAULT);                                     \
 })
 
@@ -227,9 +228,10 @@ do {									\
 
 #define put_user(x, ptr)                                                \
 ({                                                                      \
+        __typeof__(*(ptr)) __user *__p = (ptr);                         \
         might_fault();                                                  \
-        access_ok(VERIFY_WRITE, (ptr), sizeof(*(ptr))) ?                \
-                __put_user((x), (ptr)) :                                \
+        access_ok(VERIFY_WRITE, __p, sizeof(*__p)) ?                    \
+                __put_user((x), __p) :                                  \
                 -EFAULT;                                                \
 })