Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4a84ae3 authored Mar 24, 2015 by Ard Biesheuvel Committed by Russell King Mar 29, 2015

ARM: 8322/1: keep .text and .fixup regions closer together



This moves all fixup snippets to the .text.fixup section, which is
a special section that gets emitted along with the .text section
for each input object file, i.e., the snippets are kept much closer
to the code they refer to, which helps prevent linker failure on
large kernels.

Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 779c88c9

arch/arm/include/asm/futex.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		" .align 3\n" \
		" .long 1b, 4f, 2b, 4f\n" \
		" .popsection\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"4: mov %0, " err_reg "\n" \
		" b 3b\n" \

arch/arm/include/asm/uaccess.h

+5 −5

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ do { \
		__asm__ __volatile__( \
		"1: " TUSER(ldrb) " %1,[%2],#0\n" \
		"2:\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"3: mov %0, %3\n" \
		" mov %1, #0\n" \
		@@ -351,7 +351,7 @@ do { \
		__asm__ __volatile__( \
		"1: " TUSER(ldr) " %1,[%2],#0\n" \
		"2:\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"3: mov %0, %3\n" \
		" mov %1, #0\n" \
		@@ -397,7 +397,7 @@ do { \
		__asm__ __volatile__( \
		"1: " TUSER(strb) " %1,[%2],#0\n" \
		"2:\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"3: mov %0, %3\n" \
		" b 2b\n" \
		@@ -430,7 +430,7 @@ do { \
		__asm__ __volatile__( \
		"1: " TUSER(str) " %1,[%2],#0\n" \
		"2:\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"3: mov %0, %3\n" \
		" b 2b\n" \
		@@ -458,7 +458,7 @@ do { \
		THUMB( "1: " TUSER(str) " " __reg_oper1 ", [%1]\n" ) \
		THUMB( "2: " TUSER(str) " " __reg_oper0 ", [%1, #4]\n" ) \
		"3:\n" \
		" .pushsection .fixup,\"ax\"\n" \
		" .pushsection .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"4: mov %0, %3\n" \
		" b 3b\n" \

arch/arm/include/asm/word-at-a-time.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
		asm(
		"1: ldr %0, [%2]\n"
		"2:\n"
		" .pushsection .fixup,\"ax\"\n"
		" .pushsection .text.fixup,\"ax\"\n"
		" .align 2\n"
		"3: and %1, %2, #0x3\n"
		" bic %2, %2, #0x3\n"

arch/arm/kernel/entry-armv.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -545,7 +545,7 @@ ENDPROC(__und_usr)
		/*
		* The out of line fixup for the ldrt instructions above.
		*/
		.pushsection .fixup, "ax"
		.pushsection .text.fixup, "ax"
		.align 2
		4: str r4, [sp, #S_PC] @ retry current instruction
		ret r9

arch/arm/kernel/swp_emulate.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		" cmp %0, #0\n" \
		" movne %0, %4\n" \
		"2:\n" \
		" .section .fixup,\"ax\"\n" \
		" .section .text.fixup,\"ax\"\n" \
		" .align 2\n" \
		"3: mov %0, %5\n" \
		" b 2b\n" \