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-sparc64/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-sparc64/hardirq.h')
| -rw-r--r-- | include/asm-sparc64/hardirq.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h index 7df1d1346..daff61ac4 100644 --- a/include/asm-sparc64/hardirq.h +++ b/include/asm-sparc64/hardirq.h @@ -16,10 +16,13 @@ extern unsigned int local_irq_count; /* * Are we in an interrupt context? Either doing bottom half - * or hardware interrupt processing? + * or hardware interrupt processing? On any cpu? */ #define in_interrupt() ((local_irq_count + local_bh_count) != 0) +/* This tests only the local processors hw IRQ context disposition. */ +#define in_irq() (local_irq_count != 0) + #ifndef __SMP__ #define hardirq_trylock(cpu) (local_irq_count == 0) |