[PPC] Fix some irq breakage with ARCH=ppc

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
index 187388625a76..d4b2cf74da6a 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 d3963ca79ad8..ae316e6d2ca9 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;