Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile (f1252515) · Commits · 戴 / test

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -9726,7 +9726,7 @@ F: net/tipc/

		TILE ARCHITECTURE
		M: Chris Metcalf <cmetcalf@ezchip.com>
		W: http://www.tilera.com/scm/
		W: http://www.ezchip.com/scm/
		S: Supported
		F: arch/tile/
		F: drivers/char/tile-srom.c

arch/tile/include/asm/uaccess.h

+20 −17

Original line number	Diff line number	Diff line
		@@ -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)); \
		})
		@@ -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; \
		})

		@@ -246,7 +248,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" \
		@@ -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; \

arch/tile/include/uapi/asm/byteorder.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@

		#if defined (__BIG_ENDIAN__)
		#include <linux/byteorder/big_endian.h>
		#elif defined (__LITTLE_ENDIAN__)
		#include <linux/byteorder/little_endian.h>
		#else
		#error "__BIG_ENDIAN__ or __LITTLE_ENDIAN__ must be defined."
		#include <linux/byteorder/little_endian.h>
		#endif

Admin message