From: Kyle McMartin Date: Mon, 28 Aug 2006 19:42:07 +0000 (-0400) Subject: [PARISC] [BUGFIX] nullify branch delay slot of the jump back to X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c2c54574e724589858ad656a507be29f9034943;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git [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 --- diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index d55b45d54f4d..340b5e8d67ba 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