forked from Minki/linux
[PPC] Fix some irq breakage with ARCH=ppc
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
49f19ce401
commit
3211be5c6a
@ -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())
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user