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

• Lines: 20
• Date: Mon Jan 22 15:41:15 2001
• Orig file: v2.4.0/linux/include/asm-ppc/hardirq.h
• Orig date: Sat Nov 11 18:23:10 2000

diff -u --recursive --new-file v2.4.0/linux/include/asm-ppc/hardirq.h linux/include/asm-ppc/hardirq.h
@@ -47,7 +47,7 @@
 #include <asm/atomic.h>
 
 extern unsigned char global_irq_holder;
-extern unsigned volatile int global_irq_lock;
+extern unsigned volatile long global_irq_lock;
 extern atomic_t global_irq_count;
 
 static inline void release_irqlock(int cpu)
@@ -66,8 +66,8 @@
 	++local_irq_count(cpu);
 	atomic_inc(&global_irq_count);
 	while (test_bit(0,&global_irq_lock)) {
-		if (smp_processor_id() == global_irq_holder) {
-			printk("uh oh, interrupt while we hold global irq lock!\n");
+		if (cpu == global_irq_holder) {
+			printk("uh oh, interrupt while we hold global irq lock! (CPU %d)\n", cpu);
 #ifdef CONFIG_XMON
 			xmon(0);
 #endif