ARM: fix build error in arch/arm/kernel/process.c (4260415f) · Commits · 戴 / test

arch/arm/include/asm/assembler.h

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -149,10 +149,10 @@

	#define USER(x...) \		#define USER(x...) \
	9999: x; \		9999: x; \
	.section __ex_table,"a"; \		.pushsection __ex_table,"a"; \
	.align 3; \		.align 3; \
	.long 9999b,9001f; \		.long 9999b,9001f; \
	.previous		.popsection

	/*		/*
	* SMP data memory barrier		* SMP data memory barrier
	@@ -193,10 +193,10 @@
	.error "Unsupported inc macro argument"		.error "Unsupported inc macro argument"
	.endif		.endif

	.section __ex_table,"a"		.pushsection __ex_table,"a"
	.align 3		.align 3
	.long 9999b, \abort		.long 9999b, \abort
	.previous		.popsection
	.endm		.endm

	.macro usracc, instr, reg, ptr, inc, cond, rept, abort		.macro usracc, instr, reg, ptr, inc, cond, rept, abort
	@@ -234,10 +234,10 @@
	.error "Unsupported inc macro argument"		.error "Unsupported inc macro argument"
	.endif		.endif

	.section __ex_table,"a"		.pushsection __ex_table,"a"
	.align 3		.align 3
	.long 9999b, \abort		.long 9999b, \abort
	.previous		.popsection
	.endr		.endr
	.endm		.endm

arch/arm/include/asm/futex.h

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -21,14 +21,14 @@
	"2: strt %0, [%2]\n" \		"2: strt %0, [%2]\n" \
	" mov %0, #0\n" \		" mov %0, #0\n" \
	"3:\n" \		"3:\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 4f, 2b, 4f\n" \		" .long 1b, 4f, 2b, 4f\n" \
	" .previous\n" \		" .popsection\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	"4: mov %0, %4\n" \		"4: mov %0, %4\n" \
	" b 3b\n" \		" b 3b\n" \
	" .previous" \		" .popsection" \
	: "=&r" (ret), "=&r" (oldval) \		: "=&r" (ret), "=&r" (oldval) \
	: "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \		: "r" (uaddr), "r" (oparg), "Ir" (-EFAULT) \
	: "cc", "memory")		: "cc", "memory")
	@@ -102,14 +102,14 @@ futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
	" it eq @ explicit IT needed for the 2b label\n"		" it eq @ explicit IT needed for the 2b label\n"
	"2: streqt %2, [%3]\n"		"2: streqt %2, [%3]\n"
	"3:\n"		"3:\n"
	" .section __ex_table,\"a\"\n"		" .pushsection __ex_table,\"a\"\n"
	" .align 3\n"		" .align 3\n"
	" .long 1b, 4f, 2b, 4f\n"		" .long 1b, 4f, 2b, 4f\n"
	" .previous\n"		" .popsection\n"
	" .section .fixup,\"ax\"\n"		" .pushsection .fixup,\"ax\"\n"
	"4: mov %0, %4\n"		"4: mov %0, %4\n"
	" b 3b\n"		" b 3b\n"
	" .previous"		" .popsection"
	: "=&r" (val)		: "=&r" (val)
	: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)		: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
	: "cc", "memory");		: "cc", "memory");

arch/arm/include/asm/uaccess.h

+20 −20

Original line number	Original line	Diff line number	Diff line
	@@ -229,16 +229,16 @@ do { \
	__asm__ __volatile__( \		__asm__ __volatile__( \
	"1: ldrbt %1,[%2]\n" \		"1: ldrbt %1,[%2]\n" \
	"2:\n" \		"2:\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	" .align 2\n" \		" .align 2\n" \
	"3: mov %0, %3\n" \		"3: mov %0, %3\n" \
	" mov %1, #0\n" \		" mov %1, #0\n" \
	" b 2b\n" \		" b 2b\n" \
	" .previous\n" \		" .popsection\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 3b\n" \		" .long 1b, 3b\n" \
	" .previous" \		" .popsection" \
	: "+r" (err), "=&r" (x) \		: "+r" (err), "=&r" (x) \
	: "r" (addr), "i" (-EFAULT) \		: "r" (addr), "i" (-EFAULT) \
	: "cc")		: "cc")
	@@ -265,16 +265,16 @@ do { \
	__asm__ __volatile__( \		__asm__ __volatile__( \
	"1: ldrt %1,[%2]\n" \		"1: ldrt %1,[%2]\n" \
	"2:\n" \		"2:\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	" .align 2\n" \		" .align 2\n" \
	"3: mov %0, %3\n" \		"3: mov %0, %3\n" \
	" mov %1, #0\n" \		" mov %1, #0\n" \
	" b 2b\n" \		" b 2b\n" \
	" .previous\n" \		" .popsection\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 3b\n" \		" .long 1b, 3b\n" \
	" .previous" \		" .popsection" \
	: "+r" (err), "=&r" (x) \		: "+r" (err), "=&r" (x) \
	: "r" (addr), "i" (-EFAULT) \		: "r" (addr), "i" (-EFAULT) \
	: "cc")		: "cc")
	@@ -310,15 +310,15 @@ do { \
	__asm__ __volatile__( \		__asm__ __volatile__( \
	"1: strbt %1,[%2]\n" \		"1: strbt %1,[%2]\n" \
	"2:\n" \		"2:\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	" .align 2\n" \		" .align 2\n" \
	"3: mov %0, %3\n" \		"3: mov %0, %3\n" \
	" b 2b\n" \		" b 2b\n" \
	" .previous\n" \		" .popsection\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 3b\n" \		" .long 1b, 3b\n" \
	" .previous" \		" .popsection" \
	: "+r" (err) \		: "+r" (err) \
	: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \		: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \
	: "cc")		: "cc")
	@@ -343,15 +343,15 @@ do { \
	__asm__ __volatile__( \		__asm__ __volatile__( \
	"1: strt %1,[%2]\n" \		"1: strt %1,[%2]\n" \
	"2:\n" \		"2:\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	" .align 2\n" \		" .align 2\n" \
	"3: mov %0, %3\n" \		"3: mov %0, %3\n" \
	" b 2b\n" \		" b 2b\n" \
	" .previous\n" \		" .popsection\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 3b\n" \		" .long 1b, 3b\n" \
	" .previous" \		" .popsection" \
	: "+r" (err) \		: "+r" (err) \
	: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \		: "r" (x), "r" (__pu_addr), "i" (-EFAULT) \
	: "cc")		: "cc")
	@@ -371,16 +371,16 @@ do { \
	THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \		THUMB( "1: strt " __reg_oper1 ", [%1]\n" ) \
	THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \		THUMB( "2: strt " __reg_oper0 ", [%1, #4]\n" ) \
	"3:\n" \		"3:\n" \
	" .section .fixup,\"ax\"\n" \		" .pushsection .fixup,\"ax\"\n" \
	" .align 2\n" \		" .align 2\n" \
	"4: mov %0, %3\n" \		"4: mov %0, %3\n" \
	" b 3b\n" \		" b 3b\n" \
	" .previous\n" \		" .popsection\n" \
	" .section __ex_table,\"a\"\n" \		" .pushsection __ex_table,\"a\"\n" \
	" .align 3\n" \		" .align 3\n" \
	" .long 1b, 4b\n" \		" .long 1b, 4b\n" \
	" .long 2b, 4b\n" \		" .long 2b, 4b\n" \
	" .previous" \		" .popsection" \
	: "+r" (err), "+r" (__pu_addr) \		: "+r" (err), "+r" (__pu_addr) \
	: "r" (x), "i" (-EFAULT) \		: "r" (x), "i" (-EFAULT) \
	: "cc")		: "cc")

arch/arm/kernel/entry-armv.S

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -523,16 +523,16 @@ ENDPROC(__und_usr)
	/*		/*
	* The out of line fixup for the ldrt above.		* The out of line fixup for the ldrt above.
	*/		*/
	.section .fixup, "ax"		.pushsection .fixup, "ax"
	4: mov pc, r9		4: mov pc, r9
	.previous		.popsection
	.section __ex_table,"a"		.pushsection __ex_table,"a"
	.long 1b, 4b		.long 1b, 4b
	#if __LINUX_ARM_ARCH__ >= 7		#if __LINUX_ARM_ARCH__ >= 7
	.long 2b, 4b		.long 2b, 4b
	.long 3b, 4b		.long 3b, 4b
	#endif		#endif
	.previous		.popsection

	/*		/*
	* Check whether the instruction is a co-processor instruction.		* Check whether the instruction is a co-processor instruction.
	@@ -679,7 +679,7 @@ do_fpe:
	.data		.data
	ENTRY(fp_enter)		ENTRY(fp_enter)
	.word no_fp		.word no_fp
	.previous		.text

	ENTRY(no_fp)		ENTRY(no_fp)
	mov pc, lr		mov pc, lr

arch/arm/kernel/ftrace.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -62,15 +62,15 @@ int ftrace_modify_code(unsigned long pc, unsigned char *old_code,
	" movne %0, #2 \n"		" movne %0, #2 \n"
	"3:\n"		"3:\n"

	".section .fixup, \"ax\"\n"		".pushsection .fixup, \"ax\"\n"
	"4: mov %0, #1 \n"		"4: mov %0, #1 \n"
	" b 3b \n"		" b 3b \n"
	".previous\n"		".popsection\n"

	".section __ex_table, \"a\"\n"		".pushsection __ex_table, \"a\"\n"
	" .long 1b, 4b \n"		" .long 1b, 4b \n"
	" .long 2b, 4b \n"		" .long 2b, 4b \n"
	".previous\n"		".popsection\n"

	: "=r"(err), "=r"(replaced)		: "=r"(err), "=r"(replaced)
	: "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced)		: "r"(pc), "r"(new), "r"(old), "0"(err), "1"(replaced)

Admin message