All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH mips-for-linux-next] MIPS: fix genex.S build for non MIPS32r2 class processors
@ 2013-10-25 18:26 Florian Fainelli
  2013-10-28 14:36   ` Markos Chandras
  0 siblings, 1 reply; 3+ messages in thread
From: Florian Fainelli @ 2013-10-25 18:26 UTC (permalink / raw)
  To: linux-mips
  Cc: ralf, blogic, Leonid.Yegoshin, markos.chandras, jim2101024,
	Florian Fainelli

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-10-28 14:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-25 18:26 [PATCH mips-for-linux-next] MIPS: fix genex.S build for non MIPS32r2 class processors Florian Fainelli
2013-10-28 14:36 ` Markos Chandras
2013-10-28 14:36   ` Markos Chandras

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.