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/mips/dec | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'arch/mips/dec')
| -rw-r--r-- | arch/mips/dec/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/dec/irq.c b/arch/mips/dec/irq.c index c60047a41..b6841cb55 100644 --- a/arch/mips/dec/irq.c +++ b/arch/mips/dec/irq.c @@ -4,7 +4,7 @@ * Copyright (C) 1992 Linus Torvalds * Copyright (C) 1994, 1995, 1996, 1997 Ralf Baechle * - * $Id: irq.c,v 1.4 1999/10/09 00:00:57 ralf Exp $ + * $Id: irq.c,v 1.5 1999/12/04 03:58:59 ralf Exp $ */ #include <linux/errno.h> #include <linux/init.h> @@ -127,7 +127,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[cpu][irq]++; mask_irq(irq); @@ -147,7 +147,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs) unmask_irq(irq); __cli(); } - hardirq_exit(cpu); + irq_exit(cpu); /* unmasking and bottom half handling is done magically for us. */ } |