diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-10-06 11:09:40 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-10-06 11:09:40 (GMT) |
| commit | 3211be5c6a61946c75318069611699c90b10e0f8 (patch) | |
| tree | eb88f097641788dfea4d4a8f6475293a1b010777 | |
| parent | 49f19ce401edfff937c448dd74c22497da361889 (diff) | |
| download | linux-3211be5c6a61946c75318069611699c90b10e0f8.tar.xz | |
[PPC] Fix some irq breakage with ARCH=ppc
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/ppc/kernel/time.c | 2 | ||||
| -rw-r--r-- | include/asm-ppc/floppy.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 1873886..d4b2cf7 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c @@ -142,7 +142,7 @@ void timer_interrupt(struct pt_regs * regs) while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { jiffy_stamp += tb_ticks_per_jiffy; - profile_tick(CPU_PROFILING, regs); + profile_tick(CPU_PROFILING); update_process_times(user_mode(regs)); if (smp_processor_id()) diff --git a/include/asm-ppc/floppy.h b/include/asm-ppc/floppy.h index d3963ca..ae316e6 100644 --- a/include/asm-ppc/floppy.h +++ b/include/asm-ppc/floppy.h @@ -38,14 +38,14 @@ static int virtual_dma_mode; static int doing_vdma; static struct fd_dma_ops *fd_ops; -static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) +static irqreturn_t floppy_hardint(int irq, void *dev_id) { unsigned char st; int lcount; char *lptr; if (!doing_vdma) - return floppy_interrupt(irq, dev_id, regs); + return floppy_interrupt(irq, dev_id); st = 1; @@ -69,7 +69,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) virtual_dma_residue += virtual_dma_count; virtual_dma_count=0; doing_vdma = 0; - floppy_interrupt(irq, dev_id, regs); + floppy_interrupt(irq, dev_id); return IRQ_HANDLED; } return IRQ_HANDLED; |