patch-2.4.0-test6 linux/include/asm-sparc/irq.h

• Lines: 25
• Date: Sun Aug 6 11:43:19 2000
• Orig file: v2.4.0-test5/linux/include/asm-sparc/irq.h
• Orig date: Mon Jul 10 16:47:27 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-sparc/irq.h linux/include/asm-sparc/irq.h
@@ -1,4 +1,4 @@
-/* $Id: irq.h,v 1.30 2000/06/30 10:18:39 davem Exp $
+/* $Id: irq.h,v 1.31 2000/08/05 10:48:41 davem Exp $
  * irq.h: IRQ registers on the Sparc.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -23,16 +23,14 @@
 
 /* IRQ handler dispatch entry and exit. */
 #ifdef CONFIG_SMP
-extern unsigned int __local_irq_count[NR_CPUS];
 #define irq_enter(cpu, irq)                     \
 do {    hardirq_enter(cpu);                     \
         spin_unlock_wait(&global_irq_lock);     \
 	} while(0)
 #define irq_exit(cpu, irq)      hardirq_exit(cpu)
 #else
-extern unsigned int __local_irq_count;
-#define irq_enter(cpu, irq)     (__local_irq_count++)
-#define irq_exit(cpu, irq)      (__local_irq_count--)
+#define irq_enter(cpu, irq)     (++local_irq_count(cpu))
+#define irq_exit(cpu, irq)      (--local_irq_count(cpu))
 #endif
 
 /* Dave Redman (djhr@tadpole.co.uk)