Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c

driver due to the Origin A64 hacks.

1 files changed, 3 insertions, 152 deletions

diff --git a/include/asm-sparc/softirq.h b/include/asm-sparc/softirq.h
index c82a080ad..d61b56554 100644
--- a/include/asm-sparc/softirq.h
+++ b/include/asm-sparc/softirq.h
@@ -14,170 +14,21 @@
 #include <asm/hardirq.h>
 
 
-#define get_active_bhs()	(bh_mask & bh_active)
-
 #ifdef __SMP__
 extern unsigned int local_bh_count[NR_CPUS];
 
-/*
- * The locking mechanism for base handlers, to prevent re-entrancy,
- * is entirely private to an implementation, it should not be
- * referenced at all outside of this file.
- */
-extern atomic_t global_bh_lock;
-extern spinlock_t global_bh_count;
-extern spinlock_t sparc_bh_lock;
-
-extern void synchronize_bh(void);
-
-static inline void clear_active_bhs(unsigned int mask)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	bh_active &= ~(mask);
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-}
-
-extern inline void init_bh(int nr, void (*routine)(void))
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	bh_base[nr] = routine;
-	atomic_set(&bh_mask_count[nr], 0);
-	bh_mask |= 1 << nr;
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-}
-
-extern inline void remove_bh(int nr)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	bh_mask &= ~(1 << nr);
-	bh_base[nr] = NULL;
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-}
-
-extern inline void mark_bh(int nr)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	bh_active |= (1 << nr);
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-}
-
-/*
- * These use a mask count to correctly handle
- * nested disable/enable calls
- */
-extern inline void disable_bh(int nr)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	bh_mask &= ~(1 << nr);
-	atomic_inc(&bh_mask_count[nr]);
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-	synchronize_bh();
-}
-
-extern inline void enable_bh(int nr)
-{
-	unsigned long flags;
-	spin_lock_irqsave(&sparc_bh_lock, flags);
-	if (atomic_dec_and_test(&bh_mask_count[nr]))
-		bh_mask |= 1 << nr;
-	spin_unlock_irqrestore(&sparc_bh_lock, flags);
-}
-
-static inline void start_bh_atomic(void)
-{
-	atomic_inc(&global_bh_lock);
-	synchronize_bh();
-}
-
-static inline void end_bh_atomic(void)
-{
-	atomic_dec(&global_bh_lock);
-}
-
-/* These are for the IRQs testing the lock */
-static inline int softirq_trylock(int cpu)
-{
-	if (spin_trylock(&global_bh_count)) {
-		if (atomic_read(&global_bh_lock) == 0 &&
-		    local_bh_count[cpu] == 0) {
-			++local_bh_count[cpu];
-			return 1;
-		}
-		spin_unlock(&global_bh_count);
-	}
-	return 0;
-}
-
-static inline void softirq_endlock(int cpu)
-{
-	local_bh_count[cpu]--;
-	spin_unlock(&global_bh_count);
-}
-
 #define local_bh_disable()	(local_bh_count[smp_processor_id()]++)
 #define local_bh_enable()	(local_bh_count[smp_processor_id()]--)
 
+#define in_softirq() (local_bh_count[smp_processor_id()] != 0)
+
 #else
 extern unsigned int local_bh_count;
 
-#define clear_active_bhs(x)	(bh_active &= ~(x))
-#define mark_bh(nr)		(bh_active |= (1 << (nr)))
-
-/* These are for the irq's testing the lock */
-#define softirq_trylock(cpu)	(local_bh_count ? 0 : (local_bh_count=1))
-#define softirq_endlock(cpu)	(local_bh_count = 0)
-#define synchronize_bh()	barrier()
-
 #define local_bh_disable()	(local_bh_count++)
 #define local_bh_enable()	(local_bh_count--)
 
-/*
- * 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]);
-	synchronize_bh();
-}
-
-extern inline void enable_bh(int nr)
-{
-	if (atomic_dec_and_test(&bh_mask_count[nr]))
-		bh_mask |= 1 << nr;
-}
-
-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 remove_bh(int nr)
-{
-	bh_mask &= ~(1 << nr);
-	mb();
-	bh_base[nr] = NULL;
-}
-
-extern inline void start_bh_atomic(void)
-{
-	local_bh_count++;
-	barrier();
-}
-
-extern inline void end_bh_atomic(void)
-{
-	barrier();
-	local_bh_count--;
-}
+#define in_softirq() (local_bh_count != 0)
 
 #endif	/* SMP */