patch-2.4.0-test6 linux/include/asm-m68k/softirq.h

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

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-m68k/softirq.h linux/include/asm-m68k/softirq.h
@@ -7,16 +7,14 @@
 
 #include <asm/atomic.h>
 
-extern unsigned int local_bh_count[NR_CPUS];
-
-#define local_bh_disable()	(local_bh_count[smp_processor_id()]++)
-#define local_bh_enable()	(local_bh_count[smp_processor_id()]--)
+#define local_bh_disable()	(local_bh_count(smp_processor_id())++)
+#define local_bh_enable()	(local_bh_count(smp_processor_id())--)
 
 #define in_softirq() (local_bh_count != 0)
 
 /* These are for the irq's testing the lock */
-#define softirq_trylock(cpu)  (local_bh_count[cpu] ? 0 : (local_bh_count[cpu]=1))
-#define softirq_endlock(cpu)  (local_bh_count[cpu] = 0)
+#define softirq_trylock(cpu)  (local_bh_count(cpu) ? 0 : (local_bh_count(cpu)=1))
+#define softirq_endlock(cpu)  (local_bh_count(cpu) = 0)
 #define synchronize_bh()	barrier()
 
 #endif

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