Commit 2808bb2a authored by Vineet Gupta's avatar Vineet Gupta Committed by Sasha Levin

ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup

[ Upstream commit a524c218 ]
Reported-by: default avatarJo-Philipp Wich <jo@mein.io>
Fixes: 9aed02fe ("ARC: [arcompact] handle unaligned access delay slot")
Cc: linux-kernel@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Cc: stable@vger.kernel.org
Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 37fe8bb8
...@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, ...@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs,
/* clear any remanants of delay slot */ /* clear any remanants of delay slot */
if (delay_mode(regs)) { if (delay_mode(regs)) {
regs->ret = regs->bta ~1U; regs->ret = regs->bta & ~1U;
regs->status32 &= ~STATUS_DE_MASK; regs->status32 &= ~STATUS_DE_MASK;
} else { } else {
regs->ret += state.instr_len; regs->ret += state.instr_len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment