diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-27 10:50:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-27 10:50:27 -0700 |
| commit | 6525771f58cbc6ab97b5cff9069865cde8283346 (patch) | |
| tree | 94c75959ddfdd53d958ed05cf9f7bc99a3f7c6f2 /arch/arc/include/asm/entry-arcv2.h | |
| parent | 8d6454083d463a44097566616b473c7e6d4bdf02 (diff) | |
| parent | 2f029413cbfbfe519d294c6ac83a0c00e2a48a97 (diff) | |
| download | linux-6525771f58cbc6ab97b5cff9069865cde8283346.tar.bz2 | |
Merge tag 'arc-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC updates from Vineet Gupta:
- support for Edge Triggered IRQs in ARC IDU intc
- other fixes here and there
* tag 'arc-5.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
arc: prefer __section from compiler_attributes.h
dt-bindings: IDU-intc: Add support for edge-triggered interrupts
dt-bindings: IDU-intc: Clean up documentation
ARCv2: IDU-intc: Add support for edge-triggered interrupts
ARC: unwind: Mark expected switch fall-throughs
ARC: [plat-hsdk]: allow to switch between AXI DMAC port configurations
ARC: fix typo in setup_dma_ops log message
ARCv2: entry: early return from exception need not clear U & DE bits
Diffstat (limited to 'arch/arc/include/asm/entry-arcv2.h')
| -rw-r--r-- | arch/arc/include/asm/entry-arcv2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/include/asm/entry-arcv2.h b/arch/arc/include/asm/entry-arcv2.h index f5ae394ebe06..41b16f21beec 100644 --- a/arch/arc/include/asm/entry-arcv2.h +++ b/arch/arc/include/asm/entry-arcv2.h @@ -256,7 +256,7 @@ .macro FAKE_RET_FROM_EXCPN lr r9, [status32] - bic r9, r9, (STATUS_U_MASK|STATUS_DE_MASK|STATUS_AE_MASK) + bic r9, r9, STATUS_AE_MASK or r9, r9, STATUS_IE_MASK kflag r9 .endm |