linux-mips
[Top] [All Lists]

[PATCH] Fix marge error due to conflict in arch/mips/kernel/head.S

To: linux-mips@linux-mips.org
Subject: [PATCH] Fix marge error due to conflict in arch/mips/kernel/head.S
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Mon, 23 Jul 2007 00:07:34 +0900 (JST)
Cc: ralf@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
__INIT directive just before kernel_entry was dropped for most
(i.e. BOOT_RAW=n) platforms by merge accident (perhaps).  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>
---
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index f78538e..c15bbc4 100644
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -141,7 +141,7 @@
 EXPORT(stext)                                  # used for profiling
 EXPORT(_stext)
 
-#ifdef CONFIG_BOOT_RAW
+#ifndef CONFIG_BOOT_RAW
        /*
         * Give us a fighting chance of running if execution beings at the
         * kernel load address.  This is needed because this platform does

<Prev in Thread] Current Thread [Next in Thread>