From f9f3f864b5e8c09d7837d8980edba4ad52969819 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Tue, 10 Nov 2015 14:04:36 -0800 Subject: cris: Fix section mismatches in architecture startup code Section mismatches can now result in build failures. As result, cris:allnoconfig fails to build as follows. WARNING: modpost: Found 7 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' FATAL: modpost: Section mismatches detected. Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them. Part of the problem is that references from .text to .init.text are not permitted, and such references are used in cris startup code. Since references from .head.text to .init.text are permitted, move cris startup code to a new section .head.text. Signed-off-by: Guenter Roeck Signed-off-by: Jesper Nilsson --- arch/cris/arch-v10/kernel/head.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'arch/cris/arch-v10/kernel/head.S') diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S index a4877a421756..a74aa233b84e 100644 --- a/arch/cris/arch-v10/kernel/head.S +++ b/arch/cris/arch-v10/kernel/head.S @@ -5,6 +5,8 @@ * */ +#include + #define ASSEMBLER_MACROS_ONLY /* The IO_* macros use the ## token concatenation operator, so -traditional must not be used when assembling this file. */ @@ -25,7 +27,7 @@ .globl romfs_in_flash .globl swapper_pg_dir - .text + __HEAD ;; This is the entry point of the kernel. We are in supervisor mode. ;; 0x00000000 if Flash, 0x40004000 if DRAM @@ -159,7 +161,7 @@ _inflash0: ;; Put this in a suitable section where we can reclaim storage ;; after init. - .section ".init.text", "ax" + __INIT _inflash: #ifdef CONFIG_ETRAX_ETHERNET ;; Start MII clock to make sure it is running when tranceiver is reset -- cgit v1.2.3