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

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

diff -u --recursive --new-file v2.1.39/linux/include/asm-m68k/softirq.h linux/include/asm-m68k/softirq.h
@@ -4,6 +4,9 @@
 /*
  * Software interrupts.. no SMP here either.
  */
+
+#include <asm/atomic.h>
+
 #define get_active_bhs()	(bh_mask & bh_active)
 #define clear_active_bhs(x)	atomic_clear_mask((x),&bh_active)
 
@@ -14,12 +17,6 @@
 	bh_mask |= 1 << nr;
 }
 
-extern inline void remove_bh(int nr)
-{
-	bh_base[nr] = NULL;
-	bh_mask &= ~(1 << nr);
-}
-
 extern inline void mark_bh(int nr)
 {
 	set_bit(nr, &bh_active);
@@ -39,6 +36,12 @@
 {
 	if (!--bh_mask_count[nr])
 		bh_mask |= 1 << nr;
+}
+
+extern inline void remove_bh(int nr)
+{
+	bh_base[nr] = NULL;
+	bh_mask &= ~(1 << nr);
 }
 
 extern int __m68k_bh_counter;

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