Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / include / asm / uaccess.h

diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 3bf8f4e99a511c67a3a2d9c4a739929cedd5889f..07e1ba449bf1e0bd1b928646861363dd3bf3714a 100644 (file)
--- a/arch/arm64/include/asm/uaccess.h
+++ b/arch/arm64/include/asm/uaccess.h
@@ -63,7 +63,7 @@ static inline void set_fs(mm_segment_t fs)
        current_thread_info()->addr_limit = fs;
 }
 
-#define segment_eq(a,b)        ((a) == (b))
+#define segment_eq(a, b)       ((a) == (b))
 
 /*
  * Return 1 if addr < current->addr_limit, 0 otherwise.
@@ -147,7 +147,7 @@ do {                                                                        \
        default:                                                        \
                BUILD_BUG();                                            \
        }                                                               \
-       (x) = (__typeof__(*(ptr)))__gu_val;                             \
+       (x) = (__force __typeof__(*(ptr)))__gu_val;                     \
 } while (0)
 
 #define __get_user(x, ptr)                                             \