patch-2.3.30 linux/include/asm-i386/hardirq.h

Next file: linux/include/asm-i386/highmem.h
Previous file: linux/include/asm-i386/cache.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.29/linux/include/asm-i386/hardirq.h linux/include/asm-i386/hardirq.h
@@ -17,8 +17,8 @@
 #define hardirq_trylock(cpu)	(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 irq_enter(cpu, irq)	(local_irq_count[cpu]++)
+#define irq_exit(cpu, irq)	(local_irq_count[cpu]--)
 
 #define synchronize_irq()	barrier()
 
@@ -39,13 +39,17 @@
 	}
 }
 
-static inline void hardirq_enter(int cpu)
+static inline void irq_enter(int cpu, int irq)
 {
 	++local_irq_count[cpu];
 	atomic_inc(&global_irq_count);
+
+	while (test_bit(0,&global_irq_lock)) {
+		/* nothing */;
+	}
 }
 
-static inline void hardirq_exit(int cpu)
+static inline void irq_exit(int cpu, int irq)
 {
 	atomic_dec(&global_irq_count);
 	--local_irq_count[cpu];

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)