diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2008-07-11 15:29:36 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2008-07-23 15:11:29 +1000 |
| commit | 9b0e74102494971ca37a425c63031fea68bb5b79 (patch) | |
| tree | a50815d416ded6b0d46f7cc02241b6e5f0aa0072 /arch/m68knommu | |
| parent | 87f4abb45bc640638e6986f0f4d412b2d0ea21e1 (diff) | |
| download | linux-stable-9b0e74102494971ca37a425c63031fea68bb5b79.tar.gz linux-stable-9b0e74102494971ca37a425c63031fea68bb5b79.tar.bz2 linux-stable-9b0e74102494971ca37a425c63031fea68bb5b79.zip | |
m68knommu: put ColdFire head code into .text.head section
Switch the ColdFire head start up code to be in the .text.head segment.
And make sure that segment is at the start of the final linked text
segment. Fixes the linker warnings about section use mis-matches:
WARNING: vmlinux.o(.text+0xa8): Section mismatch in reference from the variable _clear_bss to the function .init.text:start_kernel()
The function _clear_bss() references
the function __init start_kernel().
This is often because _clear_bss lacks a __init
annotation or the annotation of start_kernel is wrong.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68knommu')
| -rw-r--r-- | arch/m68knommu/kernel/vmlinux.lds.S | 1 | ||||
| -rw-r--r-- | arch/m68knommu/platform/coldfire/head.S | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index 93e69236ed6f..69ba9b10767a 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S @@ -62,6 +62,7 @@ SECTIONS { .text : { _text = .; _stext = . ; + HEAD_TEXT TEXT_TEXT SCHED_TEXT LOCK_TEXT diff --git a/arch/m68knommu/platform/coldfire/head.S b/arch/m68knommu/platform/coldfire/head.S index b9aa0ca29bfb..2b0d73c0cc32 100644 --- a/arch/m68knommu/platform/coldfire/head.S +++ b/arch/m68knommu/platform/coldfire/head.S @@ -10,6 +10,7 @@ #include <linux/sys.h> #include <linux/linkage.h> +#include <linux/init.h> #include <asm/asm-offsets.h> #include <asm/coldfire.h> #include <asm/mcfcache.h> @@ -126,7 +127,7 @@ _ramend: /*****************************************************************************/ -.text +__HEAD /* * This is the codes first entry point. This is where it all |