patch-2.1.97 linux/include/asm-ppc/softirq.h

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

diff -u --recursive --new-file v2.1.96/linux/include/asm-ppc/softirq.h linux/include/asm-ppc/softirq.h
@@ -69,8 +69,8 @@
 }
 
 /* These are for the irq's testing the lock */
-#define softirq_trylock()	(__ppc_bh_counter? 0: ((__ppc_bh_counter=1),1))
-#define softirq_endlock()	(__ppc_bh_counter = 0)
+#define softirq_trylock(cpu)	(__ppc_bh_counter? 0: ((__ppc_bh_counter=1),1))
+#define softirq_endlock(cpu)	(__ppc_bh_counter = 0)
 
 #else /* __SMP__ */
 
@@ -129,7 +129,7 @@
 	spin_unlock_irqrestore(&global_bh_lock, flags);	\
 } while(0)
 
-#define softirq_trylock()					\
+#define softirq_trylock(cpu)					\
 ({								\
 	int ret = 1;						\
 	if(atomic_add_return(1, &__ppc_bh_counter) != 1) {	\
@@ -138,7 +138,7 @@
 	}							\
 	ret;							\
 })
-#define softirq_endlock()	atomic_dec(&__ppc_bh_counter)
+#define softirq_endlock(cpu)	atomic_dec(&__ppc_bh_counter)
 #define clear_active_bhs(mask)				\
 do {	unsigned long flags;				\
 	spin_lock_irqsave(&global_bh_lock, flags);	\

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