diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-27 09:46:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-27 09:46:21 -0700 |
| commit | 24131a61ec8c2d83431cb818281d3c9db986ab08 (patch) | |
| tree | 09cfec8127aa78d529aa5339706317e632522ffc /arch/arc/kernel/entry-compact.S | |
| parent | 508fea71c6b2108ce81814a58fbc8c8aaf5e430f (diff) | |
| parent | 1b10cb21d888c021bedbe678f7c26aee1bf04ffa (diff) | |
Merge tag 'arc-4.6-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- lockdep now works for ARCv2 builds
- enable DT reserved-memory binding (for forthcoming HDMI driver)
* tag 'arc-4.6-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: add support for reserved memory defined by device tree
ARC: support generic per-device coherent dma mem
Documentation: dt: arc: fix spelling mistakes
ARCv2: Enable LOCKDEP
Diffstat (limited to 'arch/arc/kernel/entry-compact.S')
| -rw-r--r-- | arch/arc/kernel/entry-compact.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arc/kernel/entry-compact.S b/arch/arc/kernel/entry-compact.S index 431433929189..0cb0abaa0479 100644 --- a/arch/arc/kernel/entry-compact.S +++ b/arch/arc/kernel/entry-compact.S @@ -341,6 +341,9 @@ END(call_do_page_fault) .Lrestore_regs: + # Interrpts are actually disabled from this point on, but will get + # reenabled after we return from interrupt/exception. + # But irq tracer needs to be told now... TRACE_ASM_IRQ_ENABLE lr r10, [status32] |