diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-06-03 09:23:20 +0000 |
| commit | ac5ff8f4a72f7b4e66f73c3c6cb9fe7758cf6f12 (patch) | |
| tree | 9fc7f8ce32e0d9a4aa055b2a58a05a5d727b333c /include/asm-sparc/irq.h | |
| parent | 52662ff3e66770fd7e4fc508c91056d29c08bff0 (diff) | |
Sync with Linux 2.1.42.
Diffstat (limited to 'include/asm-sparc/irq.h')
| -rw-r--r-- | include/asm-sparc/irq.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h index daac48d56..811bf524a 100644 --- a/include/asm-sparc/irq.h +++ b/include/asm-sparc/irq.h @@ -1,4 +1,4 @@ -/* $Id: irq.h,v 1.19 1997/05/08 20:57:39 davem Exp $ +/* $Id: irq.h,v 1.20 1997/05/28 05:25:07 davem Exp $ * irq.h: IRQ registers on the Sparc. * * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) @@ -24,7 +24,7 @@ extern void irq_enter(int cpu, int irq, void *regs); extern void irq_exit(int cpu, int irq); #else -extern __inline__ void irq_enter(int cpu, int irq) +extern __inline__ void irq_enter(int cpu, int irq, void *regs) { register int proc asm("g1"); proc = cpu; @@ -51,8 +51,8 @@ extern __inline__ void irq_exit(int cpu, int irq) } #endif /* DEBUG_IRQLOCK */ #else -#define irq_enter(cpu, irq) (local_irq_count[cpu]++) -#define irq_exit(cpu, irq) (local_irq_count[cpu]--) +#define irq_enter(cpu, irq, regs) (local_irq_count[cpu]++) +#define irq_exit(cpu, irq) (local_irq_count[cpu]--) #endif /* Dave Redman (djhr@tadpole.co.uk) |