diff options
| author | Vineet Gupta <Vineet.Gupta1@synopsys.com> | 2017-02-07 09:44:58 -0800 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-03-06 17:31:13 -0500 |
| commit | 2808bb2adc213d36185cbd7ce9de4c39c56c6b55 (patch) | |
| tree | a76a03aaeffccea0bfbf06c607d7726fabd255ea | |
| parent | 37fe8bb8a94b139dfae8d52c3e3490a78ae91b06 (diff) | |
ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
[ Upstream commit a524c218bc94c705886a0e0fedeee45d1931da32 ]
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
Cc: stable@vger.kernel.org
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
| -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 9155e6cbc13d..86970eef24e5 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; |