aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2007-07-22 11:07:34 -0400
committerRalf Baechle <ralf@linux-mips.org>2007-07-24 11:02:48 -0400
commitcdcc9eb5e014a58aba047193a73a0de8b61b988d (patch)
tree05a43732bfed296a048763c985da6e31ee678e44 /arch/mips
parent18d0e9b4799ff6e43613a068eba289ba4e002535 (diff)
[MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
__INIT directive just before kernel_entry was ignored for most platforms. This patch fixes it and get rid of this warning: WARNING: vmlinux.o(.text+0x478): Section mismatch: reference to .init.text:start_kernel (between '_stext' and 'run_init_process') Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index f78538eceef7..c15bbc436bbd 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -141,7 +141,7 @@
141EXPORT(stext) # used for profiling 141EXPORT(stext) # used for profiling
142EXPORT(_stext) 142EXPORT(_stext)
143 143
144#ifdef CONFIG_BOOT_RAW 144#ifndef CONFIG_BOOT_RAW
145 /* 145 /*
146 * Give us a fighting chance of running if execution beings at the 146 * Give us a fighting chance of running if execution beings at the
147 * kernel load address. This is needed because this platform does 147 * kernel load address. This is needed because this platform does