Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279820
b: refs/heads/master
c: abeb24a
h: refs/heads/master
v: v3
  • Loading branch information
Marc Zyngier committed Nov 15, 2011
1 parent 109de3e commit 013b94e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 50 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db0d4db22a78d31c59087f7057b8f1612fecc35d
refs/heads/master: abeb24ae4d3e543ecf0104cff08a3af4e7a42479
7 changes: 3 additions & 4 deletions trunk/arch/arm/kernel/entry-armv.S
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@
#ifdef CONFIG_MULTI_IRQ_HANDLER
ldr r1, =handle_arch_irq
mov r0, sp
ldr r1, [r1]
adr lr, BSYM(9997f)
teq r1, #0
movne pc, r1
#endif
ldr pc, [r1]
#else
arch_irq_handler_default
#endif
9997:
.endm

Expand Down
36 changes: 0 additions & 36 deletions trunk/arch/arm/mach-pxa/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,9 @@
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <mach/hardware.h>
#include <mach/irqs.h>

.macro disable_fiq
.endm

.macro get_irqnr_preamble, base, tmp
.endm

.macro arch_ret_to_user, tmp1, tmp2
.endm

.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
mrc p15, 0, \tmp, c0, c0, 0 @ CPUID
mov \tmp, \tmp, lsr #13
and \tmp, \tmp, #0x7 @ Core G
cmp \tmp, #1
bhi 1002f

@ Core Generation 1 (PXA25x)
mov \base, #io_p2v(0x40000000) @ IIR Ctl = 0x40d00000
add \base, \base, #0x00d00000
ldr \irqstat, [\base, #0] @ ICIP
ldr \irqnr, [\base, #4] @ ICMR

ands \irqnr, \irqstat, \irqnr
beq 1001f
rsb \irqstat, \irqnr, #0
and \irqstat, \irqstat, \irqnr
clz \irqnr, \irqstat
rsb \irqnr, \irqnr, #(31 + PXA_IRQ(0))
b 1001f
1002:
@ Core Generation 2 (PXA27x) or Core Generation 3 (PXA3xx)
mrc p6, 0, \irqstat, c5, c0, 0 @ ICHP
tst \irqstat, #0x80000000
beq 1001f
bic \irqstat, \irqstat, #0x80000000
mov \irqnr, \irqstat, lsr #16
add \irqnr, \irqnr, #(PXA_IRQ(0))
1001:
.endm
9 changes: 0 additions & 9 deletions trunk/arch/arm/mach-shmobile/include/mach/entry-macro.S
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,5 @@
.macro disable_fiq
.endm

.macro get_irqnr_preamble, base, tmp
.endm

.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
.endm

.macro test_for_ipi, irqnr, irqstat, base, tmp
.endm

.macro arch_ret_to_user, tmp1, tmp2
.endm

0 comments on commit 013b94e

Please sign in to comment.