patch-2.1.40 linux/include/asm-m68k/hardirq.h

Next file: linux/include/asm-m68k/keyboard.h
Previous file: linux/include/asm-m68k/elf.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.39/linux/include/asm-m68k/hardirq.h linux/include/asm-m68k/hardirq.h
@@ -1,11 +1,13 @@
 #ifndef __M68K_HARDIRQ_H
 #define __M68K_HARDIRQ_H
 
+#include <linux/tasks.h>
+
 extern unsigned int local_irq_count[NR_CPUS];
 #define in_interrupt()	(local_irq_count[smp_processor_id()] != 0)
 
-#define hardirq_trylock(cpu)	((cpu)==0)	/* always true */
-#define hardirq_endlock(cpu)	do { } while (0)
+#define hardirq_trylock(cpu)	(++local_irq_count[cpu], (cpu) == 0)
+#define hardirq_endlock(cpu)	(--local_irq_count[cpu])
 
 #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