patch-2.4.0-test3 linux/include/asm-sparc/hardirq.h

• Lines: 71
• Date: Wed Jul 5 22:15:25 2000
• Orig file: v2.4.0-test2/linux/include/asm-sparc/hardirq.h
• Orig date: Thu May 11 15:30:08 2000

diff -u --recursive --new-file v2.4.0-test2/linux/include/asm-sparc/hardirq.h linux/include/asm-sparc/hardirq.h
@@ -11,23 +11,24 @@
 #include <linux/threads.h>
 
 #ifndef CONFIG_SMP
-extern unsigned int local_irq_count;
+extern unsigned int __local_irq_count;
+#define local_irq_count(cpu)	__local_irq_count
 
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
  */
-#define in_interrupt()  ((local_irq_count + local_bh_count) != 0)
+#define in_interrupt()  ((__local_irq_count + __local_bh_count) != 0)
 
-#define hardirq_trylock(cpu)	((void)(cpu), local_irq_count == 0)
+#define hardirq_trylock(cpu)	((void)(cpu), __local_irq_count == 0)
 #define hardirq_endlock(cpu)	do { (void)(cpu); } while (0)
 
-#define hardirq_enter(cpu)	(local_irq_count++)
-#define hardirq_exit(cpu)	(local_irq_count--)
+#define hardirq_enter(cpu)	(__local_irq_count++)
+#define hardirq_exit(cpu)	(__local_irq_count--)
 
 #define synchronize_irq()	barrier()
 
-#define in_irq() (local_irq_count != 0)
+#define in_irq() (__local_irq_count != 0)
 
 #else
 
@@ -36,7 +37,8 @@
 #include <asm/system.h>
 #include <asm/smp.h>
 
-extern unsigned int local_irq_count[NR_CPUS];
+extern unsigned int __local_irq_count[NR_CPUS];
+#define local_irq_count(cpu)	__local_irq_count[cpu]
 extern unsigned char global_irq_holder;
 extern spinlock_t global_irq_lock;
 extern atomic_t global_irq_count;
@@ -46,10 +48,10 @@
  * or hardware interrupt processing?
  */
 #define in_interrupt() ({ int __cpu = smp_processor_id(); \
-	(local_irq_count[__cpu] + local_bh_count[__cpu] != 0); })
+	(local_irq_count(__cpu) + local_bh_count(__cpu) != 0); })
 
 #define in_irq() ({ int __cpu = smp_processor_id(); \
-	(local_irq_count[__cpu] != 0); })
+	(local_irq_count(__cpu) != 0); })
 
 static inline void release_irqlock(int cpu)
 {
@@ -62,14 +64,14 @@
 
 static inline void hardirq_enter(int cpu)
 {
-	++local_irq_count[cpu];
+	++local_irq_count(cpu);
 	atomic_inc(&global_irq_count);
 }
 
 static inline void hardirq_exit(int cpu)
 {
 	atomic_dec(&global_irq_count);
-	--local_irq_count[cpu];
+	--local_irq_count(cpu);
 }
 
 static inline int hardirq_trylock(int cpu)