summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include/asm/uaccess.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-02-24 15:55:28 +0100
committerIngo Molnar <mingo@kernel.org>2015-02-24 15:55:28 +0100
commita1fb6696c662920f695c97591d759391aca8a1ad (patch)
tree25cc9ca4d1d291e122ff694dd41a9cc6d6513f60 /arch/arm64/include/asm/uaccess.h
parentx86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases (diff)
parentLinux 4.0-rc1 (diff)
downloadlinux-a1fb6696c662920f695c97591d759391aca8a1ad.tar.xz
linux-a1fb6696c662920f695c97591d759391aca8a1ad.zip
Merge tag 'v4.0-rc1' into x86/mm, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/uaccess.h')
-rw-r--r--arch/arm64/include/asm/uaccess.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
index 3bf8f4e99a51..07e1ba449bf1 100644
--- 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) \