diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /include/asm-sparc/hardirq.h | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'include/asm-sparc/hardirq.h')
| -rw-r--r-- | include/asm-sparc/hardirq.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-sparc/hardirq.h b/include/asm-sparc/hardirq.h index ed47c7760..56fe88bba 100644 --- a/include/asm-sparc/hardirq.h +++ b/include/asm-sparc/hardirq.h @@ -26,6 +26,8 @@ extern unsigned int local_irq_count; #define synchronize_irq() barrier() +#define in_irq() (local_irq_count != 0) + #else #include <asm/atomic.h> @@ -45,6 +47,9 @@ extern atomic_t global_irq_count; #define in_interrupt() ({ int __cpu = smp_processor_id(); \ (local_irq_count[__cpu] + local_bh_count[__cpu] != 0); }) +#define in_irq() ({ int __cpu = smp_processor_id(); \ + (local_irq_count[__cpu] != 0); }) + static inline void release_irqlock(int cpu) { /* if we didn't own the irq lock, just ignore.. */ |