git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-shark
/
include
/
mach
/
entry-macro.S
diff --git
a/arch/arm/mach-shark/include/mach/entry-macro.S
b/arch/arm/mach-shark/include/mach/entry-macro.S
index
e2853c0
..
0bb6cc6
100644
(file)
--- a/
arch/arm/mach-shark/include/mach/entry-macro.S
+++ b/
arch/arm/mach-shark/include/mach/entry-macro.S
@@
-11,17
+11,17
@@
.endm
.macro get_irqnr_preamble, base, tmp
.endm
.macro get_irqnr_preamble, base, tmp
+ mov \base, #0xe0000000
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
.endm
.macro arch_ret_to_user, tmp1, tmp2
.endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
- mov r4, #0xe0000000
mov \irqstat, #0x0C
mov \irqstat, #0x0C
- strb \irqstat, [
r4, #0x20]
@outb(0x0C, 0x20) /* Poll command */
- ldrb \irqnr, [
r4, #0x20]
@irq = inb(0x20) & 7
+ strb \irqstat, [
\base, #0x20]
@outb(0x0C, 0x20) /* Poll command */
+ ldrb \irqnr, [
\base, #0x20]
@irq = inb(0x20) & 7
and \irqstat, \irqnr, #0x80
teq \irqstat, #0
beq 43f
and \irqstat, \irqnr, #0x80
teq \irqstat, #0
beq 43f
@@
-29,8
+29,8
@@
teq \irqnr, #2
bne 44f
43: mov \irqstat, #0x0C
teq \irqnr, #2
bne 44f
43: mov \irqstat, #0x0C
- strb \irqstat, [
r4, #0xa0]
@outb(0x0C, 0xA0) /* Poll command */
- ldrb \irqnr, [
r4, #0xa0]
@irq = (inb(0xA0) & 7) + 8
+ strb \irqstat, [
\base, #0xa0]
@outb(0x0C, 0xA0) /* Poll command */
+ ldrb \irqnr, [
\base, #0xa0]
@irq = (inb(0xA0) & 7) + 8
and \irqstat, \irqnr, #0x80
teq \irqstat, #0
beq 44f
and \irqstat, \irqnr, #0x80
teq \irqstat, #0
beq 44f