Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
arc
/
kernel
/
unaligned.c
diff --git
a/kernel/arch/arc/kernel/unaligned.c
b/kernel/arch/arc/kernel/unaligned.c
index
abd961f
..
5f69c3b
100644
(file)
--- a/
kernel/arch/arc/kernel/unaligned.c
+++ b/
kernel/arch/arc/kernel/unaligned.c
@@
-241,8
+241,9
@@
int misaligned_fixup(unsigned long address, struct pt_regs *regs,
if (state.fault)
goto fault;
if (state.fault)
goto fault;
+ /* clear any remanants of delay slot */
if (delay_mode(regs)) {
if (delay_mode(regs)) {
- regs->ret = regs->bta;
+ regs->ret = regs->bta
& ~1U
;
regs->status32 &= ~STATUS_DE_MASK;
} else {
regs->ret += state.instr_len;
regs->status32 &= ~STATUS_DE_MASK;
} else {
regs->ret += state.instr_len;