patch-2.2.0-pre5 linux/include/asm-m68k/softirq.h

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

diff -u --recursive --new-file v2.2.0-pre4/linux/include/asm-m68k/softirq.h linux/include/asm-m68k/softirq.h
@@ -13,7 +13,7 @@
 extern inline void init_bh(int nr, void (*routine)(void))
 {
 	bh_base[nr] = routine;
-	bh_mask_count[nr] = 0;
+	atomic_set(&bh_mask_count[nr], 0);
 	bh_mask |= 1 << nr;
 }
 
@@ -29,12 +29,12 @@
 extern inline void disable_bh(int nr)
 {
 	bh_mask &= ~(1 << nr);
-	bh_mask_count[nr]++;
+	atomic_inc(&bh_mask_count[nr]);
 }
 
 extern inline void enable_bh(int nr)
 {
-	if (!--bh_mask_count[nr])
+	if (atomic_dec_and_test(&bh_mask_count[nr]))
 		bh_mask |= 1 << nr;
 }
 

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