patch-2.4.20 linux-2.4.20/include/asm-ppc64/softirq.h

Next file: linux-2.4.20/include/asm-ppc64/system.h
Previous file: linux-2.4.20/include/asm-ppc64/smplock.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/include/asm-ppc64/softirq.h linux-2.4.20/include/asm-ppc64/softirq.h
@@ -8,22 +8,20 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <asm/atomic.h>
 #include <asm/hardirq.h>
 
-
 #define local_bh_disable()	do { local_bh_count(smp_processor_id())++; barrier(); } while (0)
 #define __local_bh_enable()	do { barrier(); local_bh_count(smp_processor_id())--; } while (0)
 
 #define local_bh_enable()  \
 do {                                                    \
+	barrier();					\
         if (!--local_bh_count(smp_processor_id())       \
             && softirq_pending(smp_processor_id())) {   \
                 do_softirq();                           \
         }                                               \
 } while (0)
 
-
 #define in_softirq() (local_bh_count(smp_processor_id()) != 0)
 
 #endif	/* __ASM_SOFTIRQ_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)