3 files changed, 7 insertions, 7 deletions
diff --git a/arch/sh/include/asm/segment.h b/arch/sh/include/asm/segment.h
index 5e2725f4ac49..ff795d3a6909 100644
--- a/arch/sh/include/asm/segment.h
+++ b/arch/sh/include/asm/segment.h
@@ -23,7 +23,7 @@ typedef struct {
 #define USER_DS         KERNEL_DS
 #endif
-#define segment_eq(a,b) ((a).seg == (b).seg)
+#define segment_eq(a, b) ((a).seg == (b).seg)
 #define get_ds()        (KERNEL_DS)
diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h
index 9486376605f4..a49635c51266 100644
--- a/arch/sh/include/asm/uaccess.h
+++ b/arch/sh/include/asm/uaccess.h
@@ -60,7 +60,7 @@ struct __large_struct { unsigned long buf[100]; };
        const __typeof__(*(ptr)) __user *__gu_addr = (ptr);     \
        __chk_user_ptr(ptr);                                    \
        __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-        (x) = (__typeof__(*(ptr)))__gu_val;                     \
+        (x) = (__force __typeof__(*(ptr)))__gu_val;             \
        __gu_err;                                               \
 })
@@ -71,7 +71,7 @@ struct __large_struct { unsigned long buf[100]; };
        const __typeof__(*(ptr)) *__gu_addr = (ptr);                    \
        if (likely(access_ok(VERIFY_READ, __gu_addr, (size))))          \
                __get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
-        (x) = (__typeof__(*(ptr)))__gu_val;                             \
+        (x) = (__force __typeof__(*(ptr)))__gu_val;                     \
        __gu_err;                                                       \
 })
diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h
index 2e07e0f40c6a..c01376c76b86 100644
--- a/arch/sh/include/asm/uaccess_64.h
+++ b/arch/sh/include/asm/uaccess_64.h
@@ -59,19 +59,19 @@ do {								\
        switch (size) {                                         \
        case 1:                                                 \
                retval = __put_user_asm_b((void *)&x,           \
-                                          (long)ptr);           \
+                                          (__force long)ptr);   \
                break;                                          \
        case 2:                                                 \
                retval = __put_user_asm_w((void *)&x,           \
-                                          (long)ptr);           \
+                                          (__force long)ptr);   \
                break;                                          \
        case 4:                                                 \
                retval = __put_user_asm_l((void *)&x,           \
-                                          (long)ptr);           \
+                                          (__force long)ptr);   \
                break;                                          \
        case 8:                                                 \
                retval = __put_user_asm_q((void *)&x,           \
-                                          (long)ptr);           \
+                                          (__force long)ptr);   \
                break;                                          \
        default:                                                \
                __put_user_unknown();                           \

diff --git a/arch/sh/include/asm/segment.h b/arch/sh/include/asm/segment.h index 5e2725f4ac49..ff795d3a6909 100644 --- a/arch/sh/include/asm/segment.h +++ b/arch/sh/include/asm/segment.h
@@ -23,7 +23,7 @@ typedef struct {
23	#define USER_DS KERNEL_DS	23	#define USER_DS KERNEL_DS
24	#endif	24	#endif
25		25
26	#define segment_eq(a,b) ((a).seg == (b).seg)	26	#define segment_eq(a, b) ((a).seg == (b).seg)
27		27
28	#define get_ds() (KERNEL_DS)	28	#define get_ds() (KERNEL_DS)
29		29


diff --git a/arch/sh/include/asm/uaccess.h b/arch/sh/include/asm/uaccess.h index 9486376605f4..a49635c51266 100644 --- a/arch/sh/include/asm/uaccess.h +++ b/arch/sh/include/asm/uaccess.h
@@ -60,7 +60,7 @@ struct __large_struct { unsigned long buf[100]; };
60	const __typeof__((ptr)) __user __gu_addr = (ptr); \	60	const __typeof__((ptr)) __user __gu_addr = (ptr); \
61	__chk_user_ptr(ptr); \	61	__chk_user_ptr(ptr); \
62	__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \	62	__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
63	(x) = (__typeof__(*(ptr)))__gu_val; \	63	(x) = (__force __typeof__(*(ptr)))__gu_val; \
64	__gu_err; \	64	__gu_err; \
65	})	65	})
66		66
@@ -71,7 +71,7 @@ struct __large_struct { unsigned long buf[100]; };
71	const __typeof__((ptr)) __gu_addr = (ptr); \	71	const __typeof__((ptr)) __gu_addr = (ptr); \
72	if (likely(access_ok(VERIFY_READ, __gu_addr, (size)))) \	72	if (likely(access_ok(VERIFY_READ, __gu_addr, (size)))) \
73	__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \	73	__get_user_size(__gu_val, __gu_addr, (size), __gu_err); \
74	(x) = (__typeof__(*(ptr)))__gu_val; \	74	(x) = (__force __typeof__(*(ptr)))__gu_val; \
75	__gu_err; \	75	__gu_err; \
76	})	76	})
77		77


diff --git a/arch/sh/include/asm/uaccess_64.h b/arch/sh/include/asm/uaccess_64.h index 2e07e0f40c6a..c01376c76b86 100644 --- a/arch/sh/include/asm/uaccess_64.h +++ b/arch/sh/include/asm/uaccess_64.h
@@ -59,19 +59,19 @@ do { \
59	switch (size) { \	59	switch (size) { \
60	case 1: \	60	case 1: \
61	retval = __put_user_asm_b((void *)&x, \	61	retval = __put_user_asm_b((void *)&x, \
62	(long)ptr); \	62	(__force long)ptr); \
63	break; \	63	break; \
64	case 2: \	64	case 2: \
65	retval = __put_user_asm_w((void *)&x, \	65	retval = __put_user_asm_w((void *)&x, \
66	(long)ptr); \	66	(__force long)ptr); \
67	break; \	67	break; \
68	case 4: \	68	case 4: \
69	retval = __put_user_asm_l((void *)&x, \	69	retval = __put_user_asm_l((void *)&x, \
70	(long)ptr); \	70	(__force long)ptr); \
71	break; \	71	break; \
72	case 8: \	72	case 8: \
73	retval = __put_user_asm_q((void *)&x, \	73	retval = __put_user_asm_q((void *)&x, \
74	(long)ptr); \	74	(__force long)ptr); \
75	break; \	75	break; \
76	default: \	76	default: \
77	__put_user_unknown(); \	77	__put_user_unknown(); \