diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /arch/mips64/sgi-ip22 | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/mips64/sgi-ip22')
| -rw-r--r-- | arch/mips64/sgi-ip22/ip22-int.c | 18 | ||||
| -rw-r--r-- | arch/mips64/sgi-ip22/ip22-timer.c | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/arch/mips64/sgi-ip22/ip22-int.c b/arch/mips64/sgi-ip22/ip22-int.c index 765c90da1..420e47fc7 100644 --- a/arch/mips64/sgi-ip22/ip22-int.c +++ b/arch/mips64/sgi-ip22/ip22-int.c @@ -1,4 +1,4 @@ -/* $Id: ip22-int.c,v 1.4 1999/11/19 20:35:23 ralf Exp $ +/* $Id: ip22-int.c,v 1.3 1999/12/04 03:59:01 ralf Exp $ * * indy_int.c: Routines for generic manipulation of the INT[23] ASIC * found on INDY workstations.. @@ -272,7 +272,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) int do_random, cpu; cpu = smp_processor_id(); - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[0][irq]++; printk("Got irq %d, press a key.", irq); @@ -308,7 +308,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs * regs) add_interrupt_randomness(irq); __cli(); } - hardirq_exit(cpu); + irq_exit(cpu); /* unmasking and bottom half handling is done magically for us. */ } @@ -433,10 +433,10 @@ void indy_local0_irqdispatch(struct pt_regs *regs) action = local_irq_action[irq]; } - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[0][irq + 16]++; action->handler(irq, action->dev_id, regs); - hardirq_exit(cpu); + irq_exit(cpu); } void indy_local1_irqdispatch(struct pt_regs *regs) @@ -457,10 +457,10 @@ void indy_local1_irqdispatch(struct pt_regs *regs) irq = lc1msk_to_irqnr[mask]; action = local_irq_action[irq]; } - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[0][irq + 24]++; action->handler(irq, action->dev_id, regs); - hardirq_exit(cpu); + irq_exit(cpu); } void indy_buserror_irq(struct pt_regs *regs) @@ -468,13 +468,13 @@ void indy_buserror_irq(struct pt_regs *regs) int cpu = smp_processor_id(); int irq = 6; - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[0][irq]++; printk("Got a bus error IRQ, shouldn't happen yet\n"); show_regs(regs); printk("Spinning...\n"); while(1); - hardirq_exit(cpu); + irq_exit(cpu); } /* Misc. crap just to keep the kernel linking... */ diff --git a/arch/mips64/sgi-ip22/ip22-timer.c b/arch/mips64/sgi-ip22/ip22-timer.c index c5e038b72..cda6076e2 100644 --- a/arch/mips64/sgi-ip22/ip22-timer.c +++ b/arch/mips64/sgi-ip22/ip22-timer.c @@ -1,4 +1,4 @@ -/* $Id: ip22-timer.c,v 1.3 1999/10/19 20:51:52 ralf Exp $ +/* $Id: ip22-timer.c,v 1.5 2000/01/21 22:34:03 ralf Exp $ * * indy_timer.c: Setting up the clock on the INDY 8254 controller. * @@ -267,12 +267,12 @@ void indy_8254timer_irq(void) int cpu = smp_processor_id(); int irq = 4; - hardirq_enter(cpu); + irq_enter(cpu); kstat.irqs[0][irq]++; printk("indy_8254timer_irq: Whoops, should not have gotten this IRQ\n"); prom_getchar(); ArcEnterInteractiveMode(); - hardirq_exit(cpu); + irq_exit(cpu); } void do_gettimeofday(struct timeval *tv) |