diff options
-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 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) | |||
142 | while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { | 142 | while ((next_dec = tb_ticks_per_jiffy - tb_delta(&jiffy_stamp)) <= 0) { |
143 | jiffy_stamp += tb_ticks_per_jiffy; | 143 | jiffy_stamp += tb_ticks_per_jiffy; |
144 | 144 | ||
145 | profile_tick(CPU_PROFILING, regs); | 145 | profile_tick(CPU_PROFILING); |
146 | update_process_times(user_mode(regs)); | 146 | update_process_times(user_mode(regs)); |
147 | 147 | ||
148 | if (smp_processor_id()) | 148 | 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; | |||
38 | static int doing_vdma; | 38 | static int doing_vdma; |
39 | static struct fd_dma_ops *fd_ops; | 39 | static struct fd_dma_ops *fd_ops; |
40 | 40 | ||
41 | static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | 41 | static irqreturn_t floppy_hardint(int irq, void *dev_id) |
42 | { | 42 | { |
43 | unsigned char st; | 43 | unsigned char st; |
44 | int lcount; | 44 | int lcount; |
45 | char *lptr; | 45 | char *lptr; |
46 | 46 | ||
47 | if (!doing_vdma) | 47 | if (!doing_vdma) |
48 | return floppy_interrupt(irq, dev_id, regs); | 48 | return floppy_interrupt(irq, dev_id); |
49 | 49 | ||
50 | 50 | ||
51 | st = 1; | 51 | st = 1; |
@@ -69,7 +69,7 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) | |||
69 | virtual_dma_residue += virtual_dma_count; | 69 | virtual_dma_residue += virtual_dma_count; |
70 | virtual_dma_count=0; | 70 | virtual_dma_count=0; |
71 | doing_vdma = 0; | 71 | doing_vdma = 0; |
72 | floppy_interrupt(irq, dev_id, regs); | 72 | floppy_interrupt(irq, dev_id); |
73 | return IRQ_HANDLED; | 73 | return IRQ_HANDLED; |
74 | } | 74 | } |
75 | return IRQ_HANDLED; | 75 | return IRQ_HANDLED; |