]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PPC] Fix some irq breakage with ARCH=ppc
authorPaul Mackerras <paulus@samba.org>
Fri, 6 Oct 2006 11:09:40 +0000 (21:09 +1000)
committerPaul Mackerras <paulus@samba.org>
Fri, 6 Oct 2006 11:09:40 +0000 (21:09 +1000)
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/ppc/kernel/time.c
include/asm-ppc/floppy.h

index 187388625a768ed45a15d3bb68c0c93dc491e8af..d4b2cf74da6aa177ecb6d598f29571b53e89817c 100644 (file)
@@ -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())
index d3963ca79ad88a76c358a86c2a13c92969a977f6..ae316e6d2ca99650cd42eb57ae9903f3c3672c4c 100644 (file)
@@ -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;