diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:25 +0800 |
| commit | 7428034763fada56405a2b53f30853b9d1e5c9e5 (patch) | |
| tree | cf3a7e2b0f687c5c6810fb8e20bd7d6dc4f1b299 /arch/arc/kernel/unaligned.c | |
| parent | 8c05367bbe9c86c8c416bcccadaef4b3868437f7 (diff) | |
| parent | 57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-17.02-rt
Diffstat (limited to 'arch/arc/kernel/unaligned.c')
| -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; |