From e9118a4914e47e915952842828401779f09cecb8 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Tue, 13 Jan 2015 10:04:43 -0500 Subject: tile: default to little endian on older toolchains Older toolchains may not specify __LITTLE_ENDIAN__, but older toolchains were all little endian. Don't make things unnecessarily hard for those toolchains. Signed-off-by: Chris Metcalf --- arch/tile/include/uapi/asm/byteorder.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/tile') diff --git a/arch/tile/include/uapi/asm/byteorder.h b/arch/tile/include/uapi/asm/byteorder.h index fb72ecf49218..6b8fa2e1cf6e 100644 --- a/arch/tile/include/uapi/asm/byteorder.h +++ b/arch/tile/include/uapi/asm/byteorder.h @@ -14,8 +14,6 @@ #if defined (__BIG_ENDIAN__) #include -#elif defined (__LITTLE_ENDIAN__) -#include #else -#error "__BIG_ENDIAN__ or __LITTLE_ENDIAN__ must be defined." +#include #endif -- cgit v1.2.3 From f3c927125fa49a42d596434d1ed454195c0d4530 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Tue, 13 Jan 2015 14:39:05 -0500 Subject: tile: fix put_user sparse errors Use x86's __inttype macro instead of using the typeof(x-x) trick to generate a suitable integer size type. This avoids a sparse warning when examining the x-x type with a bitwise type. Reviewed-by: Michael S. Tsirkin Signed-off-by: Chris Metcalf --- arch/tile/include/asm/uaccess.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'arch/tile') diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h index b6cde3209b96..b81b24a8489b 100644 --- a/arch/tile/include/asm/uaccess.h +++ b/arch/tile/include/asm/uaccess.h @@ -113,15 +113,15 @@ struct exception_table_entry { extern int fixup_exception(struct pt_regs *regs); +/* + * This is a type: either unsigned long, if the argument fits into + * that type, or otherwise unsigned long long. + */ +#define __inttype(x) \ + __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL)) + /* * Support macros for __get_user(). - * - * Implementation note: The "case 8" logic of casting to the type of - * the result of subtracting the value from itself is basically a way - * of keeping all integer types the same, but casting any pointers to - * ptrdiff_t, i.e. also an integer type. This way there are no - * questionable casts seen by the compiler on an ILP32 platform. - * * Note that __get_user() and __put_user() assume proper alignment. */ @@ -178,7 +178,7 @@ extern int fixup_exception(struct pt_regs *regs); "9:" \ : "=r" (ret), "=r" (__a), "=&r" (__b) \ : "r" (ptr), "i" (-EFAULT)); \ - (x) = (__typeof(x))(__typeof((x)-(x))) \ + (x) = (__force __typeof(x))(__inttype(x)) \ (((u64)__hi32(__a, __b) << 32) | \ __lo32(__a, __b)); \ }) @@ -246,7 +246,7 @@ extern int __get_user_bad(void) #define __put_user_4(x, ptr, ret) __put_user_asm(sw, x, ptr, ret) #define __put_user_8(x, ptr, ret) \ ({ \ - u64 __x = (__typeof((x)-(x)))(x); \ + u64 __x = (__force __inttype(x))(x); \ int __lo = (int) __x, __hi = (int) (__x >> 32); \ asm volatile("1: { sw %1, %2; addi %0, %1, 4 }\n" \ "2: { sw %0, %3; movei %0, 0 }\n" \ -- cgit v1.2.3 From b9f705758a4faaf86532bddf6ea3c50d6778ba42 Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Tue, 13 Jan 2015 14:41:20 -0500 Subject: tile: enable sparse checks for get/put_user Add an extra intermediate variable to __get_user and __put_user to give sparse an opportunity to detect mismatches. Reviewed-by: Michael S. Tsirkin Signed-off-by: Chris Metcalf --- arch/tile/include/asm/uaccess.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'arch/tile') diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h index b81b24a8489b..f41cb53cf645 100644 --- a/arch/tile/include/asm/uaccess.h +++ b/arch/tile/include/asm/uaccess.h @@ -210,14 +210,16 @@ extern int __get_user_bad(void) #define __get_user(x, ptr) \ ({ \ int __ret; \ + typeof(x) _x; \ __chk_user_ptr(ptr); \ switch (sizeof(*(ptr))) { \ - case 1: __get_user_1(x, ptr, __ret); break; \ - case 2: __get_user_2(x, ptr, __ret); break; \ - case 4: __get_user_4(x, ptr, __ret); break; \ - case 8: __get_user_8(x, ptr, __ret); break; \ + case 1: __get_user_1(_x, ptr, __ret); break; \ + case 2: __get_user_2(_x, ptr, __ret); break; \ + case 4: __get_user_4(_x, ptr, __ret); break; \ + case 8: __get_user_8(_x, ptr, __ret); break; \ default: __ret = __get_user_bad(); break; \ } \ + (x) = (typeof(*(ptr))) _x; \ __ret; \ }) @@ -289,12 +291,13 @@ extern int __put_user_bad(void) #define __put_user(x, ptr) \ ({ \ int __ret; \ + typeof(*(ptr)) _x = (x); \ __chk_user_ptr(ptr); \ switch (sizeof(*(ptr))) { \ - case 1: __put_user_1(x, ptr, __ret); break; \ - case 2: __put_user_2(x, ptr, __ret); break; \ - case 4: __put_user_4(x, ptr, __ret); break; \ - case 8: __put_user_8(x, ptr, __ret); break; \ + case 1: __put_user_1(_x, ptr, __ret); break; \ + case 2: __put_user_2(_x, ptr, __ret); break; \ + case 4: __put_user_4(_x, ptr, __ret); break; \ + case 8: __put_user_8(_x, ptr, __ret); break; \ default: __ret = __put_user_bad(); break; \ } \ __ret; \ -- cgit v1.2.3