patch-2.3.51 linux/include/asm-ia64/hardirq.h

• Lines: 128
• Date: Fri Mar 10 15:24:02 2000
• Orig file: v2.3.50/linux/include/asm-ia64/hardirq.h
• Orig date: Sun Feb 13 19:29:04 2000

diff -u --recursive --new-file v2.3.50/linux/include/asm-ia64/hardirq.h linux/include/asm-ia64/hardirq.h
@@ -2,77 +2,100 @@
 #define _ASM_IA64_HARDIRQ_H
 
 /*
- * Copyright (C) 1998, 1999 Hewlett-Packard Co
- * Copyright (C) 1998, 1999 David Mosberger-Tang <davidm@hpl.hp.com>
+ * Copyright (C) 1998-2000 Hewlett-Packard Co
+ * Copyright (C) 1998-2000 David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
 #include <linux/config.h>
+
 #include <linux/threads.h>
+#include <linux/irq.h>
+
+typedef struct {
+	unsigned int __local_irq_count;
+	unsigned int __local_bh_count;
+	atomic_t __nmi_counter;
+# if NR_CPUS > 1
+	unsigned int __pad[13];		/* this assumes 64-byte cache-lines... */
+# endif
+} ____cacheline_aligned irq_cpustat_t;
 
-extern unsigned int local_irq_count[NR_CPUS];
-extern unsigned long hardirq_no[NR_CPUS];
+extern irq_cpustat_t irq_stat[NR_CPUS];
+
+/*
+ * Simple wrappers reducing source bloat
+ */
+#define local_irq_count(cpu)	(irq_stat[(cpu)].__local_irq_count)
+#define local_bh_count(cpu)	(irq_stat[(cpu)].__local_bh_count)
+#define nmi_counter(cpu)	(irq_stat[(cpu)].__nmi_counter)
 
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
  */
-
-#define in_irq() (local_irq_count[smp_processor_id()] != 0)
-
 #define in_interrupt()						\
 ({								\
 	int __cpu = smp_processor_id();				\
-	(local_irq_count[__cpu] + local_bh_count[__cpu]) != 0;	\
+	(local_irq_count(__cpu) + local_bh_count(__cpu)) != 0;	\
 })
 
-
+#define in_irq() (local_irq_count(smp_processor_id()) != 0)
 
 #ifndef CONFIG_SMP
-# define hardirq_trylock(cpu)		(local_irq_count[cpu] == 0)
-# define hardirq_endlock(cpu)		((void) 0)
+# define hardirq_trylock(cpu)		(local_irq_count(cpu) == 0)
+# define hardirq_endlock(cpu)		do { } while (0)
 
-# define hardirq_enter(cpu, irq)	(local_irq_count[cpu]++)
-# define hardirq_exit(cpu, irq)		(local_irq_count[cpu]--)
+# define irq_enter(cpu, irq)		(++local_irq_count(cpu))
+# define irq_exit(cpu, irq)		(--local_irq_count(cpu))
 
 # define synchronize_irq()		barrier()
 #else
 
-#include <linux/spinlock.h>
-
 #include <asm/atomic.h>
 #include <asm/smp.h>
 
-extern int global_irq_holder;
-extern spinlock_t global_irq_lock;
-extern atomic_t global_irq_count;
+extern unsigned char global_irq_holder;
+extern unsigned volatile int global_irq_lock;
+
+static inline int irqs_running (void)
+{
+	int i;
+
+	for (i = 0; i < smp_num_cpus; i++)
+		if (local_irq_count(i))
+			return 1;
+	return 0;
+}
 
 static inline void release_irqlock(int cpu)
 {
 	/* if we didn't own the irq lock, just ignore.. */
 	if (global_irq_holder == cpu) {
 		global_irq_holder = NO_PROC_ID;
-		spin_unlock(&global_irq_lock);
+		clear_bit(0,&global_irq_lock);
         }
 }
 
-static inline void hardirq_enter(int cpu, int irq)
+static inline void irq_enter(int cpu, int irq)
 {
-	++local_irq_count[cpu];
-        atomic_inc(&global_irq_count);
+	++local_irq_count(cpu);
+
+	while (test_bit(0,&global_irq_lock)) {
+		/* nothing */;
+	}
 }
 
-static inline void hardirq_exit(int cpu, int irq)
+static inline void irq_exit(int cpu, int irq)
 {
-	atomic_dec(&global_irq_count);
-        --local_irq_count[cpu];
+	--local_irq_count(cpu);
 }
 
 static inline int hardirq_trylock(int cpu)
 {
-	return !local_irq_count[cpu] && !test_bit(0,&global_irq_lock);
+	return !local_irq_count(cpu) && !test_bit(0,&global_irq_lock);
 }
 
-#define hardirq_endlock(cpu)  ((void)0)
+#define hardirq_endlock(cpu)	do { } while (0)
 
 extern void synchronize_irq(void);