git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-next-2019-03-20' of git://anongit.freedesktop.org/drm/drm-intel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
hardware
/
entry-macro-iomd.S
diff --git
a/arch/arm/include/asm/hardware/entry-macro-iomd.S
b/arch/arm/include/asm/hardware/entry-macro-iomd.S
index 8c215acd9b573232a6818de2cd847047bdc6bb6e..f7692731e514359a6a8fb66cb229444b9cf9fabe 100644
(file)
--- a/
arch/arm/include/asm/hardware/entry-macro-iomd.S
+++ b/
arch/arm/include/asm/hardware/entry-macro-iomd.S
@@
-16,25
+16,25
@@
ldr \tmp, =irq_prio_h
teq \irqstat, #0
#ifdef IOMD_BASE
ldr \tmp, =irq_prio_h
teq \irqstat, #0
#ifdef IOMD_BASE
- ldr
eqb
\irqstat, [\base, #IOMD_DMAREQ] @ get dma
+ ldr
beq
\irqstat, [\base, #IOMD_DMAREQ] @ get dma
addeq \tmp, \tmp, #256 @ irq_prio_h table size
teqeq \irqstat, #0
bne 2406f
#endif
addeq \tmp, \tmp, #256 @ irq_prio_h table size
teqeq \irqstat, #0
bne 2406f
#endif
- ldr
eqb
\irqstat, [\base, #IOMD_IRQREQA] @ get low priority
+ ldr
beq
\irqstat, [\base, #IOMD_IRQREQA] @ get low priority
addeq \tmp, \tmp, #256 @ irq_prio_d table size
teqeq \irqstat, #0
#ifdef IOMD_IRQREQC
addeq \tmp, \tmp, #256 @ irq_prio_d table size
teqeq \irqstat, #0
#ifdef IOMD_IRQREQC
- ldr
eqb
\irqstat, [\base, #IOMD_IRQREQC]
+ ldr
beq
\irqstat, [\base, #IOMD_IRQREQC]
addeq \tmp, \tmp, #256 @ irq_prio_l table size
teqeq \irqstat, #0
#endif
#ifdef IOMD_IRQREQD
addeq \tmp, \tmp, #256 @ irq_prio_l table size
teqeq \irqstat, #0
#endif
#ifdef IOMD_IRQREQD
- ldr
eqb
\irqstat, [\base, #IOMD_IRQREQD]
+ ldr
beq
\irqstat, [\base, #IOMD_IRQREQD]
addeq \tmp, \tmp, #256 @ irq_prio_lc table size
teqeq \irqstat, #0
#endif
addeq \tmp, \tmp, #256 @ irq_prio_lc table size
teqeq \irqstat, #0
#endif
-2406: ldr
neb
\irqnr, [\tmp, \irqstat] @ get IRQ number
+2406: ldr
bne
\irqnr, [\tmp, \irqstat] @ get IRQ number
.endm
/*
.endm
/*