diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2006-08-28 15:42:07 -0400 |
|---|---|---|
| committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-04 08:47:15 -0400 |
| commit | 9c2c54574e724589858ad656a507be29f9034943 (patch) | |
| tree | 876637c43f82bb2e27a557e352c3cb97456c6e0d /arch | |
| parent | 136ce40e9f1f24ca1dbf7714c669a7bca56440ea (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/entry.S | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
| 1069 | BL preempt_schedule_irq, %r2 | 1069 | BL preempt_schedule_irq, %r2 |
| 1070 | nop | 1070 | nop |
| 1071 | 1071 | ||
| 1072 | b intr_restore /* ssm PSW_SM_I done by intr_restore */ | 1072 | b,n intr_restore /* ssm PSW_SM_I done by intr_restore */ |
| 1073 | #endif /* CONFIG_PREEMPT */ | 1073 | #endif /* CONFIG_PREEMPT */ |
| 1074 | 1074 | ||
| 1075 | .import do_signal,code | 1075 | .import do_signal,code |