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

Commit ee951c63 authored by Stephen Boyd's avatar Stephen Boyd Committed by Russell King
Browse files

ARM: 7568/1: Sort exception table at compile time 



Add the ARM machine identifier to sortextable and select the
config option so that we can sort the exception table at compile
time. sortextable relies on a section named __ex_table existing
in the vmlinux, but ARM's linker script places the exception
table in the data section. Give the exception table its own
section so that sortextable can find it.

This allows us to skip the sorting step during boot.

Cc: David Daney <david.daney@cavium.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a68becd1

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config ARM 
	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT if MMU

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN

	select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)

arch/arm/kernel/vmlinux.lds.S

+9 −10
Original line number Diff line number Diff line
@@ -114,6 +114,15 @@ SECTIONS 


	RO_DATA(PAGE_SIZE)



	. = ALIGN(4);

	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {

		__start___ex_table = .;

#ifdef CONFIG_MMU

		*(__ex_table)

#endif

		__stop___ex_table = .;

	}



#ifdef CONFIG_ARM_UNWIND

	/*

	 * Stack unwinding tables
@@ -219,16 +228,6 @@ SECTIONS 
		CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)

		READ_MOSTLY_DATA(L1_CACHE_BYTES)



		/*

		 * The exception fixup table (might need resorting at runtime)

		 */

		. = ALIGN(4);

		__start___ex_table = .;

#ifdef CONFIG_MMU

		*(__ex_table)

#endif

		__stop___ex_table = .;



		/*

		 * and the usual data section

		 */

scripts/sortextable.c

+1 −0
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ do_file(char const *const fname) 
	case EM_S390:

		custom_sort = sort_relative_table;

		break;

	case EM_ARM:

	case EM_MIPS:

		break;

	}  /* end switch */