patch-2.4.10 linux/include/asm-mips/softirq.h

• Lines: 52
• Date: Sun Sep 9 10:43:01 2001
• Orig file: v2.4.9/linux/include/asm-mips/softirq.h
• Orig date: Sat May 13 08:31:25 2000

diff -u --recursive --new-file v2.4.9/linux/include/asm-mips/softirq.h linux/include/asm-mips/softirq.h
@@ -1,11 +1,11 @@
-/* $Id: softirq.h,v 1.11 2000/02/23 00:41:38 ralf Exp $
- *
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1997, 1998, 1999, 2000 by Ralf Baechle
+ * Copyright (C) 1997, 1998, 1999, 2000, 2001 Ralf Baechle
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
+ * Copyright (C) 1999, 2001 MIPS Technologies, Inc.
  */
 #ifndef _ASM_SOFTIRQ_H
 #define _ASM_SOFTIRQ_H
@@ -13,12 +13,33 @@
 #include <asm/atomic.h>
 #include <asm/hardirq.h>
 
-#define cpu_bh_disable(cpu)	do { local_bh_count(cpu)++; barrier(); } while (0)
-#define cpu_bh_enable(cpu)	do { barrier(); local_bh_count(cpu)--; } while (0)
+extern inline void cpu_bh_disable(int cpu)
+{
+	local_bh_count(cpu)++;
+	barrier();
+}
+ 
+extern inline void __cpu_bh_enable(int cpu)
+{
+	barrier();
+	local_bh_count(cpu)--;
+}
+
 
 #define local_bh_disable()	cpu_bh_disable(smp_processor_id())
-#define local_bh_enable()	cpu_bh_enable(smp_processor_id())
+#define __local_bh_enable()	__cpu_bh_enable(smp_processor_id())
+#define local_bh_enable()					\
+do {								\
+	int cpu;						\
+								\
+	barrier();						\
+	cpu = smp_processor_id();				\
+	if (!--local_bh_count(cpu) && softirq_pending(cpu))	\
+		do_softirq();					\
+} while (0)
 
 #define in_softirq() (local_bh_count(smp_processor_id()) != 0)
+
+#define __cpu_raise_softirq(cpu, nr)	set_bit(nr, &softirq_pending(cpu))
 
 #endif /* _ASM_SOFTIRQ_H */