patch-2.2.8 linux/include/asm-ppc/hardirq.h

• Lines: 45
• Date: Thu Apr 29 12:39:01 1999
• Orig file: v2.2.7/linux/include/asm-ppc/hardirq.h
• Orig date: Mon Oct 5 13:13:43 1998

diff -u --recursive --new-file v2.2.7/linux/include/asm-ppc/hardirq.h linux/include/asm-ppc/hardirq.h
@@ -1,22 +1,22 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-extern unsigned int local_irq_count[NR_CPUS];
+extern unsigned int ppc_local_irq_count[NR_CPUS];
 
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
  */
 #define in_interrupt() ({ int __cpu = smp_processor_id(); \
-	(local_irq_count[__cpu] + local_bh_count[__cpu] != 0); })
+	(ppc_local_irq_count[__cpu] + ppc_local_bh_count[__cpu] != 0); })
 
 #ifndef __SMP__
 
-#define hardirq_trylock(cpu)	(local_irq_count[cpu] == 0)
+#define hardirq_trylock(cpu)	(ppc_local_irq_count[cpu] == 0)
 #define hardirq_endlock(cpu)	do { } while (0)
 
-#define hardirq_enter(cpu)	(local_irq_count[cpu]++)
-#define hardirq_exit(cpu)	(local_irq_count[cpu]--)
+#define hardirq_enter(cpu)	(ppc_local_irq_count[cpu]++)
+#define hardirq_exit(cpu)	(ppc_local_irq_count[cpu]--)
 
 #define synchronize_irq()	do { } while (0)
 
@@ -39,14 +39,14 @@
 
 static inline void hardirq_enter(int cpu)
 {
-	++local_irq_count[cpu];
+	++ppc_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];
+	--ppc_local_irq_count[cpu];
 }
 
 static inline int hardirq_trylock(int cpu)