target/linux/arc770/patches-4.4/900-revert-unaligned-access-delay-corner-case.patch

   1 From: Jo-Philipp Wich <jo@mein.io>
   2 Date: Tue, 7 Feb 2017 09:26:00 +0100
   3 Subject: [PATCH] arc: revert broken upstream change
   4
   5 The upstream commit
   6 "9aed02f ARC: [arcompact] handle unaligned access delay slot corner case"
   7 introduced a syntax error in arch/arc/kernel/unaligned.c, leading to the
   8 following build failure:
   9
  10     arch/arc/kernel/unaligned.c: In function 'misaligned_fixup':
  11     arch/arc/kernel/unaligned.c:246:25: error: expected ';' before '~' token
  12        regs->ret = regs->bta ~1U;
  13                          ^
  14     make[6]: *** [arch/arc/kernel/unaligned.o] Error 1
  15
  16 This patch reverts the offending change until an upstream fix is available.
  17
  18 Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  19 --- a/arch/arc/kernel/unaligned.c
  20 +++ b/arch/arc/kernel/unaligned.c
  21 @@ -241,9 +241,8 @@ int misaligned_fixup(unsigned long addre
  22         if (state.fault)
  23                 goto fault;
  24
  25 -       /* clear any remanants of delay slot */
  26         if (delay_mode(regs)) {
  27 -               regs->ret = regs->bta ~1U;
  28 +               regs->ret = regs->bta;
  29                 regs->status32 &= ~STATUS_DE_MASK;
  30         } else {
  31                 regs->ret += state.instr_len;