From: Kyle McMartin <kyle@parisc-linux.org>
Date: Mon, 28 Aug 2006 19:42:07 +0000 (-0400)
Subject: [PARISC] [BUGFIX] nullify branch delay slot of the jump back to
X-Git-Tag: v2.6.19-rc1~34^2~27
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2c54574e724589858ad656a507be29f9034943;p=linux-2.6

[PARISC] [BUGFIX] nullify branch delay slot of the jump back to

intr_restore in intr_do_preempt. This prevents the execution
of an unwanted insn...

Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
---

diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index d55b45d54f..340b5e8d67 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -1069,7 +1069,7 @@ intr_do_preempt:
 	BL	preempt_schedule_irq, %r2
 	nop
 
-	b	intr_restore		/* ssm PSW_SM_I done by intr_restore */
+	b,n	intr_restore		/* ssm PSW_SM_I done by intr_restore */
 #endif /* CONFIG_PREEMPT */
 
 	.import do_signal,code