Commit fa62f39d authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: Fix build error due to PTR used in more places 



Use PTR_WD instead of PTR to avoid clashes with other parts.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent e783362e

arch/mips/include/asm/asm.h

+2 −2
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ symbol = value 


#define PTR_SCALESHIFT	2



#define PTR		.word

#define PTR_WD		.word

#define PTRSIZE		4

#define PTRLOG		2

#endif
@@ -310,7 +310,7 @@ symbol = value 


#define PTR_SCALESHIFT	3



#define PTR		.dword

#define PTR_WD		.dword

#define PTRSIZE		8

#define PTRLOG		3

#endif

arch/mips/include/asm/ftrace.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ do { \ 
		".previous\n"				\

							\

		".section\t__ex_table,\"a\"\n\t"	\

		STR(PTR) "\t1b, 3b\n\t"			\

		STR(PTR_WD) "\t1b, 3b\n\t"		\

		".previous\n"				\

							\

		: [tmp_dst] "=&r" (dst), [tmp_err] "=r" (error)\
@@ -54,7 +54,7 @@ do { \ 
		".previous\n"			\

						\

		".section\t__ex_table,\"a\"\n\t"\

		STR(PTR) "\t1b, 3b\n\t"		\

		STR(PTR_WD) "\t1b, 3b\n\t"	\

		".previous\n"			\

						\

		: [tmp_err] "=r" (error)	\

arch/mips/include/asm/r4kcache.h

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static inline void flush_scache_line(unsigned long addr) 
	"	j	2b			\n"		\

	"	.previous			\n"		\

	"	.section __ex_table,\"a\"	\n"		\

	"	"STR(PTR)" 1b, 3b		\n"		\

	"	"STR(PTR_WD)" 1b, 3b		\n"		\

	"	.previous"					\

	: "+r" (__err)						\

	: "i" (op), "r" (addr), "i" (-EFAULT));			\
@@ -142,7 +142,7 @@ static inline void flush_scache_line(unsigned long addr) 
	"	j	2b			\n"		\

	"	.previous			\n"		\

	"	.section __ex_table,\"a\"	\n"		\

	"	"STR(PTR)" 1b, 3b		\n"		\

	"	"STR(PTR_WD)" 1b, 3b		\n"		\

	"	.previous"					\

	: "+r" (__err)						\

	: "i" (op), "r" (addr), "i" (-EFAULT));			\

arch/mips/include/asm/unaligned-emul.h

+88 −88
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -41,8 +41,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -74,10 +74,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -102,8 +102,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -125,8 +125,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -145,8 +145,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -178,10 +178,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -223,14 +223,14 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR)"\t5b, 11b\n\t"		    \

		STR(PTR)"\t6b, 11b\n\t"		    \

		STR(PTR)"\t7b, 11b\n\t"		    \

		STR(PTR)"\t8b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		STR(PTR_WD)"\t5b, 11b\n\t"	    \

		STR(PTR_WD)"\t6b, 11b\n\t"	    \

		STR(PTR_WD)"\t7b, 11b\n\t"	    \

		STR(PTR_WD)"\t8b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -255,8 +255,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"              \

		STR(PTR)"\t2b, 4b\n\t"              \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                        \

		: "r" (value), "r" (addr), "i" (-EFAULT));\
@@ -276,8 +276,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                                \

		: "r" (value), "r" (addr), "i" (-EFAULT));  \
@@ -296,8 +296,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                                \

		: "r" (value), "r" (addr), "i" (-EFAULT));  \
@@ -325,10 +325,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (res)				    \

		: "r" (value), "r" (addr), "i" (-EFAULT)    \
@@ -365,14 +365,14 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR)"\t5b, 11b\n\t"		    \

		STR(PTR)"\t6b, 11b\n\t"		    \

		STR(PTR)"\t7b, 11b\n\t"		    \

		STR(PTR)"\t8b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		STR(PTR_WD)"\t5b, 11b\n\t"	    \

		STR(PTR_WD)"\t6b, 11b\n\t"	    \

		STR(PTR_WD)"\t7b, 11b\n\t"	    \

		STR(PTR_WD)"\t8b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (res)				    \

		: "r" (value), "r" (addr), "i" (-EFAULT)    \
@@ -398,8 +398,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -419,8 +419,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -452,10 +452,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -481,8 +481,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -504,8 +504,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -524,8 +524,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=&r" (value), "=r" (res)         \

		: "r" (addr), "i" (-EFAULT));       \
@@ -557,10 +557,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -602,14 +602,14 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR)"\t5b, 11b\n\t"		    \

		STR(PTR)"\t6b, 11b\n\t"		    \

		STR(PTR)"\t7b, 11b\n\t"		    \

		STR(PTR)"\t8b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		STR(PTR_WD)"\t5b, 11b\n\t"	    \

		STR(PTR_WD)"\t6b, 11b\n\t"	    \

		STR(PTR_WD)"\t7b, 11b\n\t"	    \

		STR(PTR_WD)"\t8b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (value), "=r" (res)	    \

		: "r" (addr), "i" (-EFAULT));       \
@@ -632,8 +632,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                        \

		: "r" (value), "r" (addr), "i" (-EFAULT));\
@@ -653,8 +653,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                                \

		: "r" (value), "r" (addr), "i" (-EFAULT));  \
@@ -673,8 +673,8 @@ do { \ 
		"j\t3b\n\t"                         \

		".previous\n\t"                     \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 4b\n\t"               \

		STR(PTR)"\t2b, 4b\n\t"               \

		STR(PTR_WD)"\t1b, 4b\n\t"           \

		STR(PTR_WD)"\t2b, 4b\n\t"           \

		".previous"                         \

		: "=r" (res)                                \

		: "r" (value), "r" (addr), "i" (-EFAULT));  \
@@ -703,10 +703,10 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (res)				    \

		: "r" (value), "r" (addr), "i" (-EFAULT)    \
@@ -743,14 +743,14 @@ do { \ 
		"j\t10b\n\t"			    \

		".previous\n\t"			    \

		".section\t__ex_table,\"a\"\n\t"    \

		STR(PTR)"\t1b, 11b\n\t"		    \

		STR(PTR)"\t2b, 11b\n\t"		    \

		STR(PTR)"\t3b, 11b\n\t"		    \

		STR(PTR)"\t4b, 11b\n\t"		    \

		STR(PTR)"\t5b, 11b\n\t"		    \

		STR(PTR)"\t6b, 11b\n\t"		    \

		STR(PTR)"\t7b, 11b\n\t"		    \

		STR(PTR)"\t8b, 11b\n\t"		    \

		STR(PTR_WD)"\t1b, 11b\n\t"	    \

		STR(PTR_WD)"\t2b, 11b\n\t"	    \

		STR(PTR_WD)"\t3b, 11b\n\t"	    \

		STR(PTR_WD)"\t4b, 11b\n\t"	    \

		STR(PTR_WD)"\t5b, 11b\n\t"	    \

		STR(PTR_WD)"\t6b, 11b\n\t"	    \

		STR(PTR_WD)"\t7b, 11b\n\t"	    \

		STR(PTR_WD)"\t8b, 11b\n\t"	    \

		".previous"			    \

		: "=&r" (res)				    \

		: "r" (value), "r" (addr), "i" (-EFAULT)    \

arch/mips/kernel/mips-r2-to-r6-emul.c

+52 −52
Original line number Diff line number Diff line
@@ -1258,10 +1258,10 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	10b\n"

			"	.previous\n"

			"	.section	__ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1333,10 +1333,10 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	10b\n"

			"       .previous\n"

			"	.section	__ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1404,10 +1404,10 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	9b\n"

			"	.previous\n"

			"	.section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1474,10 +1474,10 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	9b\n"

			"	.previous\n"

			"	.section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1589,14 +1589,14 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	9b\n"

			"	.previous\n"

			"	.section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR) " 5b,8b\n"

			STR(PTR) " 6b,8b\n"

			STR(PTR) " 7b,8b\n"

			STR(PTR) " 0b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			STR(PTR_WD) " 5b,8b\n"

			STR(PTR_WD) " 6b,8b\n"

			STR(PTR_WD) " 7b,8b\n"

			STR(PTR_WD) " 0b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1708,14 +1708,14 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j      9b\n"

			"	.previous\n"

			"	.section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR) " 5b,8b\n"

			STR(PTR) " 6b,8b\n"

			STR(PTR) " 7b,8b\n"

			STR(PTR) " 0b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			STR(PTR_WD) " 5b,8b\n"

			STR(PTR_WD) " 6b,8b\n"

			STR(PTR_WD) " 7b,8b\n"

			STR(PTR_WD) " 0b,8b\n"

			"	.previous\n"

			"	.set    pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1827,14 +1827,14 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"	j	9b\n"

			"	.previous\n"

			"	.section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR) " 5b,8b\n"

			STR(PTR) " 6b,8b\n"

			STR(PTR) " 7b,8b\n"

			STR(PTR) " 0b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			STR(PTR_WD) " 5b,8b\n"

			STR(PTR_WD) " 6b,8b\n"

			STR(PTR_WD) " 7b,8b\n"

			STR(PTR_WD) " 0b,8b\n"

			"	.previous\n"

			"	.set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -1945,14 +1945,14 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"       j	9b\n"

			"       .previous\n"

			"       .section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,8b\n"

			STR(PTR) " 2b,8b\n"

			STR(PTR) " 3b,8b\n"

			STR(PTR) " 4b,8b\n"

			STR(PTR) " 5b,8b\n"

			STR(PTR) " 6b,8b\n"

			STR(PTR) " 7b,8b\n"

			STR(PTR) " 0b,8b\n"

			STR(PTR_WD) " 1b,8b\n"

			STR(PTR_WD) " 2b,8b\n"

			STR(PTR_WD) " 3b,8b\n"

			STR(PTR_WD) " 4b,8b\n"

			STR(PTR_WD) " 5b,8b\n"

			STR(PTR_WD) " 6b,8b\n"

			STR(PTR_WD) " 7b,8b\n"

			STR(PTR_WD) " 0b,8b\n"

			"       .previous\n"

			"       .set	pop\n"

			: "+&r"(rt), "=&r"(rs),
@@ -2007,7 +2007,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"j	2b\n"

			".previous\n"

			".section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,3b\n"

			STR(PTR_WD) " 1b,3b\n"

			".previous\n"

			: "=&r"(res), "+&r"(err)

			: "r"(vaddr), "i"(SIGSEGV)
@@ -2065,7 +2065,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"j	2b\n"

			".previous\n"

			".section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,3b\n"

			STR(PTR_WD) " 1b,3b\n"

			".previous\n"

			: "+&r"(res), "+&r"(err)

			: "r"(vaddr), "i"(SIGSEGV));
@@ -2126,7 +2126,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"j	2b\n"

			".previous\n"

			".section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,3b\n"

			STR(PTR_WD) " 1b,3b\n"

			".previous\n"

			: "=&r"(res), "+&r"(err)

			: "r"(vaddr), "i"(SIGSEGV)
@@ -2189,7 +2189,7 @@ int mipsr2_decoder(struct pt_regs *regs, u32 inst, unsigned long *fcr31) 
			"j	2b\n"

			".previous\n"

			".section        __ex_table,\"a\"\n"

			STR(PTR) " 1b,3b\n"

			STR(PTR_WD) " 1b,3b\n"

			".previous\n"

			: "+&r"(res), "+&r"(err)

			: "r"(vaddr), "i"(SIGSEGV));