patch-2.1.36 linux/include/asm-sparc/hardirq.h

Next file: linux/include/asm-sparc/init.h
Previous file: linux/include/asm-sparc/fbio.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.35/linux/include/asm-sparc/hardirq.h linux/include/asm-sparc/hardirq.h
@@ -10,12 +10,11 @@
 
 extern unsigned int local_irq_count[NR_CPUS];
 #define in_interrupt()	(local_irq_count[smp_processor_id()] != 0)
-#define hardirq_depth()	(local_irq_count[smp_processor_id()])
 
 #ifndef __SMP__
 
-#define hardirq_trylock(cpu)	(++local_irq_count[cpu], (cpu)==0)
-#define hardirq_endlock(cpu)	(--local_irq_count[cpu])
+#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]--)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov