Merge with Linux 2.1.131 and more MIPS goodies.

(Did I mention that CVS is buggy ...)

1 files changed, 13 insertions, 23 deletions

diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h
index 5ca51ac77..6ab9ef7ec 100644
--- a/include/asm-sparc64/hardirq.h
+++ b/include/asm-sparc64/hardirq.h
@@ -1,6 +1,6 @@
 /* hardirq.h: 64-bit Sparc hard IRQ support.
  *
- * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1997, 1998 David S. Miller (davem@caip.rutgers.edu)
  */
 
 #ifndef __SPARC64_HARDIRQ_H
@@ -13,7 +13,12 @@ extern unsigned int local_irq_count;
 #else
 #define local_irq_count		(cpu_data[smp_processor_id()].irq_count)
 #endif
-#define in_interrupt()		(local_irq_count != 0)
+
+/*
+ * Are we in an interrupt context? Either doing bottom half
+ * or hardware interrupt processing?
+ */
+#define in_interrupt() ((local_irq_count + local_bh_count) != 0)
 
 #ifndef __SMP__
 
@@ -23,7 +28,7 @@ extern unsigned int local_irq_count;
 #define hardirq_enter(cpu)	(local_irq_count++)
 #define hardirq_exit(cpu)	(local_irq_count--)
 
-#define synchronize_irq()	do { } while(0)
+#define synchronize_irq()	barrier()
 
 #else /* (__SMP__) */
 
@@ -47,7 +52,7 @@ static inline void release_irqlock(int cpu)
 
 static inline void hardirq_enter(int cpu)
 {
-	++cpu_data[cpu].irq_count;
+	++(cpu_data[cpu].irq_count);
 	atomic_inc(&global_irq_count);
 	membar("#StoreLoad | #StoreStore");
 }
@@ -56,31 +61,16 @@ static inline void hardirq_exit(int cpu)
 {
 	membar("#StoreStore | #LoadStore");
 	atomic_dec(&global_irq_count);
-	--cpu_data[cpu].irq_count;
+	--(cpu_data[cpu].irq_count);
 }
 
 static inline int hardirq_trylock(int cpu)
 {
-	unsigned long flags;
-
-	__save_and_cli(flags);
-	atomic_inc(&global_irq_count);
-	if(atomic_read(&global_irq_count) != 1 ||
-	   (*(((unsigned char *)(&global_irq_lock)))) != 0) {
-		atomic_dec(&global_irq_count);
-		__restore_flags(flags);
-		return 0;
-	}
-	++cpu_data[cpu].irq_count;
-	return 1;
+	return (! atomic_read(&global_irq_count) &&
+		! spin_is_locked (&global_irq_lock));
 }
 
-static inline void hardirq_endlock(int cpu)
-{
-	__cli();
-	hardirq_exit(cpu);
-	__sti();
-}
+#define hardirq_endlock(cpu)	do { } while (0)
 
 extern void synchronize_irq(void);