patch-2.4.19 linux-2.4.19/include/asm-ia64/softirq.h

• Lines: 27
• Date: Fri Aug 2 17:39:45 2002
• Orig file: linux-2.4.18/include/asm-ia64/softirq.h
• Orig date: Sat Sep 8 12:02:31 2001

diff -urN linux-2.4.18/include/asm-ia64/softirq.h linux-2.4.19/include/asm-ia64/softirq.h
@@ -3,21 +3,21 @@
 
 /*
  * Copyright (C) 1998-2001 Hewlett-Packard Co
- * Copyright (C) 1998-2001 David Mosberger-Tang <davidm@hpl.hp.com>
+ *	David Mosberger-Tang <davidm@hpl.hp.com>
  */
 #include <asm/hardirq.h>
 
-#define __local_bh_enable()	do { barrier(); local_bh_count()--; } while (0)
+#define __local_bh_enable()	do { barrier(); really_local_bh_count()--; } while (0)
 
-#define local_bh_disable()	do { local_bh_count()++; barrier(); } while (0)
+#define local_bh_disable()	do { really_local_bh_count()++; barrier(); } while (0)
 #define local_bh_enable()								\
 do {											\
 	__local_bh_enable();								\
-	if (__builtin_expect(local_softirq_pending(), 0) && local_bh_count() == 0)	\
+	if (__builtin_expect(local_softirq_pending(), 0) && really_local_bh_count() == 0)	\
 		do_softirq();								\
 } while (0)
 
 
-#define in_softirq()		(local_bh_count() != 0)
+#define in_softirq()		(really_local_bh_count() != 0)
 
 #endif /* _ASM_IA64_SOFTIRQ_H */