projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
[cascardo/linux.git]
/
arch
/
arc
/
include
/
asm
/
irqflags-compact.h
diff --git
a/arch/arc/include/asm/irqflags-compact.h
b/arch/arc/include/asm/irqflags-compact.h
index
c1d3645
..
4c6eed8
100644
(file)
--- a/
arch/arc/include/asm/irqflags-compact.h
+++ b/
arch/arc/include/asm/irqflags-compact.h
@@
-188,10
+188,10
@@
static inline int arch_irqs_disabled(void)
.endm
.macro IRQ_ENABLE scratch
+ TRACE_ASM_IRQ_ENABLE
lr \scratch, [status32]
or \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK)
flag \scratch
- TRACE_ASM_IRQ_ENABLE
.endm
#endif /* __ASSEMBLY__ */