Merge with Linux 2.4.0-test6-pre4.

1 files changed, 15 insertions, 11 deletions

diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h
index 3961ac4a4..66ab89ce4 100644
--- a/include/asm-alpha/hardirq.h
+++ b/include/asm-alpha/hardirq.h
@@ -1,20 +1,19 @@
 #ifndef _ALPHA_HARDIRQ_H
 #define _ALPHA_HARDIRQ_H
 
-/* Initially just a straight copy of the i386 code.  */
-
 #include <linux/config.h>
 #include <linux/threads.h>
 
-#ifndef CONFIG_SMP
-extern int __local_irq_count;
-#define local_irq_count(cpu)  ((void)(cpu), __local_irq_count)
-extern unsigned long __irq_attempt[];
-#define irq_attempt(cpu, irq)  ((void)(cpu), __irq_attempt[irq])
-#else
-#define local_irq_count(cpu)  (cpu_data[cpu].irq_count)
-#define irq_attempt(cpu, irq) (cpu_data[cpu].irq_attempt[irq])
-#endif
+/* entry.S is sensitive to the offsets of these fields */
+typedef struct {
+	unsigned int __softirq_active;
+	unsigned int __softirq_mask;
+	unsigned int __local_irq_count;
+	unsigned int __local_bh_count;
+	unsigned int __syscall_count;
+} ____cacheline_aligned irq_cpustat_t;
+
+#include <linux/irq_cpustat.h>	/* Standard mappings for irq_cpustat_t above */
 
 /*
  * Are we in an interrupt context? Either doing bottom half
@@ -31,6 +30,9 @@ extern unsigned long __irq_attempt[];
 
 #ifndef CONFIG_SMP
 
+extern unsigned long __irq_attempt[];
+#define irq_attempt(cpu, irq)  ((void)(cpu), __irq_attempt[irq])
+
 #define hardirq_trylock(cpu)	(local_irq_count(cpu) == 0)
 #define hardirq_endlock(cpu)	((void) 0)
 
@@ -41,6 +43,8 @@ extern unsigned long __irq_attempt[];
 
 #else
 
+#define irq_attempt(cpu, irq) (cpu_data[cpu].irq_attempt[irq])
+
 #include <asm/atomic.h>
 #include <linux/spinlock.h>
 #include <asm/smp.h>