diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 18:02:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-03 18:02:47 -0700 |
| commit | 49deffe0b0e4c2030696c7a6fd680bacf4761069 (patch) | |
| tree | 9708f6d60e62b1c5c7adfe19cf37d633eb2af86e /arch/arc/kernel/intc-arcv2.c | |
| parent | 5419e783829127dba712be769bce8c6a1ec0057e (diff) | |
| parent | ef25bacbb0193f98e9b297c00b54913086571094 (diff) | |
Merge tag 'arc-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC updates from Vineet Gupta:
- ARCv2 support for native 64-bit atomics using LLOCK/SCONDD
instructions
- Support for upcoming 3.0 release of HS38 cores
- Dwarf unwindinder improvements:
- enable unwinding of hand written assembler code using CFI
pseudo-ops
- switch to .eh_frame (as opposed to historic .debug_frame)
- get rid of a bunch of adhoc band-aids in the process
- Misc fixes:
- perf supporting generic cache-references and cache-misses (Alexey)
- default NODE_SHIFT (Noam Camus)
- usage of KFLAG instruction to set IE (Yuriy)
- Platforms:
- Add "model" property across the DT (Alexey)
- Enable MODULE_* in defconfigs
* tag 'arc-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [plat*] enables MODULE*
ARCv2: fix local_save_flags
ARC: CONFIG_NODES_SHIFT fix default values
ARCv2: intc: Use kflag if STATUS32.IE must be reset
ARC: .exit.* sections can be discarded in .eh_frame regime
ARC: dw2 unwind: enable cfi pseudo ops in string lib
ARC: dw2 unwind: add infrastructure for adding cfi pseudo ops to asm
ARC: entry: make ret_from_system_call local label
ARC: dw2 unwind: don't force dwarf 2
ARC: dw2 unwind: switch to .eh_frame based unwinding
ARC: dw2 unwind: factor CIE specifics for .eh_frame/.debug_frame
ARC: module: support R_ARC_32_PCREL relocation
arc: perf: Enable generic "cache-references" and "cache-misses" events
ARC: [plat-eznps] add missing atomic_fetch_xxx operations
ARCv2: Implement atomic64 based on LLOCKD/SCONDD instructions
ARCv2: Support dynamic peripheral address space in HS38 rel 3.0 cores
ARCv2: identify HS38 rel 3.0 cores
ARCv2: Add support for ZeBu Emulation platform for HS cores
arc: Add "model" properly in device tree description of all boards
Diffstat (limited to 'arch/arc/kernel/intc-arcv2.c')
| -rw-r--r-- | arch/arc/kernel/intc-arcv2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/kernel/intc-arcv2.c b/arch/arc/kernel/intc-arcv2.c index 6c24faf48b16..62b59409a5d9 100644 --- a/arch/arc/kernel/intc-arcv2.c +++ b/arch/arc/kernel/intc-arcv2.c @@ -74,7 +74,7 @@ void arc_init_IRQ(void) tmp = read_aux_reg(0xa); tmp |= STATUS_AD_MASK | (irq_prio << 1); tmp &= ~STATUS_IE_MASK; - asm volatile("flag %0 \n"::"r"(tmp)); + asm volatile("kflag %0 \n"::"r"(tmp)); } static void arcv2_irq_mask(struct irq_data *data) |