diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-07 09:16:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:51:14 -0400 |
commit | 2850bc273776cbb1b510c5828e9e456dffb50a32 (patch) | |
tree | 340bd599b6efde40618ef89de59cbe957269eac2 /drivers/macintosh/via-pmu68k.c | |
parent | 00079e04fe478cd3c59ae2106ef2fbe779e67024 (diff) |
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes
pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs
*.
Places where we used to call m68k_handle_int() recursively with the same
pt_regs have simply lost the second argument, the rest is switched to
__m68k_handle_int().
The rest of patch is just dropping pt_regs * where needed.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh/via-pmu68k.c')
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index 98ec915d0409..d9986f3a3fbf 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
@@ -221,7 +221,7 @@ pmu_init(void) | |||
221 | } | 221 | } |
222 | if (pmu_state == idle) { | 222 | if (pmu_state == idle) { |
223 | adb_int_pending = 1; | 223 | adb_int_pending = 1; |
224 | pmu_interrupt(0, NULL, NULL); | 224 | pmu_interrupt(0, NULL); |
225 | } | 225 | } |
226 | pmu_poll(); | 226 | pmu_poll(); |
227 | udelay(10); | 227 | udelay(10); |
@@ -562,11 +562,11 @@ pmu_poll(void) | |||
562 | local_irq_save(flags); | 562 | local_irq_save(flags); |
563 | if (via1[IFR] & SR_INT) { | 563 | if (via1[IFR] & SR_INT) { |
564 | via1[IFR] = SR_INT; | 564 | via1[IFR] = SR_INT; |
565 | pmu_interrupt(IRQ_MAC_ADB_SR, NULL, NULL); | 565 | pmu_interrupt(IRQ_MAC_ADB_SR, NULL); |
566 | } | 566 | } |
567 | if (via1[IFR] & CB1_INT) { | 567 | if (via1[IFR] & CB1_INT) { |
568 | via1[IFR] = CB1_INT; | 568 | via1[IFR] = CB1_INT; |
569 | pmu_interrupt(IRQ_MAC_ADB_CL, NULL, NULL); | 569 | pmu_interrupt(IRQ_MAC_ADB_CL, NULL); |
570 | } | 570 | } |
571 | local_irq_restore(flags); | 571 | local_irq_restore(flags); |
572 | } | 572 | } |