diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /include/asm-alpha/hardirq.h | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'include/asm-alpha/hardirq.h')
| -rw-r--r-- | include/asm-alpha/hardirq.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-alpha/hardirq.h b/include/asm-alpha/hardirq.h index 1b0c1a051..1468b28e3 100644 --- a/include/asm-alpha/hardirq.h +++ b/include/asm-alpha/hardirq.h @@ -6,6 +6,7 @@ #include <linux/tasks.h> extern unsigned int local_irq_count[NR_CPUS]; +extern unsigned long hardirq_no[NR_CPUS]; /* * Are we in an interrupt context? Either doing bottom half @@ -32,6 +33,7 @@ extern unsigned int local_irq_count[NR_CPUS]; #include <asm/atomic.h> #include <asm/spinlock.h> +#include <asm/smp.h> extern int global_irq_holder; extern spinlock_t global_irq_lock; @@ -50,10 +52,12 @@ static inline void hardirq_enter(int cpu, int irq) { ++local_irq_count[cpu]; atomic_inc(&global_irq_count); + hardirq_no[cpu] |= 1L << irq; /* debugging only */ } static inline void hardirq_exit(int cpu, int irq) { + hardirq_no[cpu] &= ~(1L << irq); /* debugging only */ atomic_dec(&global_irq_count); --local_irq_count[cpu]; } |