linux-mips
[Top] [All Lists]

[PATCH mips-for-linux-next] MIPS: fix genex.S build for non MIPS32r2 cla

To: linux-mips@linux-mips.org
Subject: [PATCH mips-for-linux-next] MIPS: fix genex.S build for non MIPS32r2 class processors
From: "Florian Fainelli" <f.fainelli@gmail.com>
Date: Fri, 25 Oct 2013 11:26:57 -0700
Cc: ralf@linux-mips.org, blogic@openwrt.org, Leonid.Yegoshin@imgtec.com, markos.chandras@imgtec.com, jim2101024@gmail.com, "Florian Fainelli" <f.fainelli@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Commit d712357d ("MIPS: Print correct PC in trace dump after NMI
exception") introduced assembly code which uses the "ehb" instruction,
which is only available in MIPS32r2 class processors and causes such
build errors on MIPS32r1 processors:

  AS      arch/mips/kernel/genex.o
arch/mips/kernel/genex.S: Assembler messages:
arch/mips/kernel/genex.S:386: Error: opcode not supported on this
processor: mips32 (mips32) `ehb'
make[2]: *** [arch/mips/kernel/genex.o] Error 1
make[1]: *** [arch/mips/kernel] Error 2
make[1]: *** Waiting for unfinished jobs....

Use _ehb which properly substitutes to a nop or a real ehb depending on
the processor we are building for.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 arch/mips/kernel/genex.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
index 72853aa..47d7583 100644
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -383,7 +383,7 @@ NESTED(nmi_handler, PT_SIZE, sp)
        li      k1, ~(ST0_BEV | ST0_ERL)
        and     k0, k0, k1
        mtc0    k0, CP0_STATUS
-       ehb
+       _ehb
        SAVE_ALL
        move    a0, sp
        jal     nmi_exception_handler
-- 
1.8.3.2



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