Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.

1 files changed, 1 insertions, 48 deletions

diff --git a/include/asm-m68k/softirq.h b/include/asm-m68k/softirq.h
index f27b11256..a51563cd7 100644
--- a/include/asm-m68k/softirq.h
+++ b/include/asm-m68k/softirq.h
@@ -7,59 +7,12 @@
 
 #include <asm/atomic.h>
 
-#define get_active_bhs()	(bh_mask & bh_active)
-#define clear_active_bhs(x)	atomic_clear_mask((x),&bh_active)
-
-extern inline void init_bh(int nr, void (*routine)(void))
-{
-	bh_base[nr] = routine;
-	atomic_set(&bh_mask_count[nr], 0);
-	bh_mask |= 1 << nr;
-}
-
-extern inline void mark_bh(int nr)
-{
-	set_bit(nr, &bh_active);
-}
-
-/*
- * These use a mask count to correctly handle
- * nested disable/enable calls
- */
-extern inline void disable_bh(int nr)
-{
-	bh_mask &= ~(1 << nr);
-	atomic_inc(&bh_mask_count[nr]);
-}
-
-extern inline void enable_bh(int nr)
-{
-	if (atomic_dec_and_test(&bh_mask_count[nr]))
-		bh_mask |= 1 << nr;
-}
-
-extern inline void remove_bh(int nr)
-{
-	bh_base[nr] = NULL;
-	bh_mask &= ~(1 << nr);
-}
-
 extern unsigned int local_bh_count[NR_CPUS];
 
 #define local_bh_disable()	(local_bh_count[smp_processor_id()]++)
 #define local_bh_enable()	(local_bh_count[smp_processor_id()]--)
 
-extern inline void start_bh_atomic(void)
-{
-	local_bh_count[smp_processor_id()]++;
-	barrier();
-}
-
-extern inline void end_bh_atomic(void)
-{
-	barrier();
-	local_bh_count[smp_processor_id()]--;
-}
+#define in_softirq() (local_bh_count != 0)
 
 /* These are for the irq's testing the lock */
 #define softirq_trylock(cpu)  (local_bh_count[cpu] ? 0 : (local_bh_count[cpu]=1))