diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2017-02-07 09:44:58 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-14 15:22:50 -0800 |
| commit | e871ea6bcf99097731fceff3e8e1c5ed05b04ae2 (patch) | |
| tree | 9a098014a7e17e0c88e6cf30c1db5f3fe1d2b91e /arch/arc | |
| parent | 6a1bd90632464c129ad5f9ca7c54917a6dd7cb4b (diff) | |
ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
commit a524c218bc94c705886a0e0fedeee45d1931da32 upstream.
Reported-by: Jo-Philipp Wich <jo@mein.io>
Fixes: 9aed02feae57bf7 ("ARC: [arcompact] handle unaligned access delay slot")
Cc: linux-kernel@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc')
| -rw-r--r-- | arch/arc/kernel/unaligned.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c index 91ebe382147f..5f69c3bd59bb 100644 --- a/arch/arc/kernel/unaligned.c +++ b/arch/arc/kernel/unaligned.c @@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long address, struct pt_regs *regs, /* clear any remanants of delay slot */ if (delay_mode(regs)) { - regs->ret = regs->bta ~1U; + regs->ret = regs->bta & ~1U; regs->status32 &= ~STATUS_DE_MASK; } else { regs->ret += state.instr_len; |