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-mips64/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-mips64/hardirq.h')
| -rw-r--r-- | include/asm-mips64/hardirq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-mips64/hardirq.h b/include/asm-mips64/hardirq.h index 7f3adeb68..3bc56d38d 100644 --- a/include/asm-mips64/hardirq.h +++ b/include/asm-mips64/hardirq.h @@ -1,4 +1,4 @@ -/* $Id: hardirq.h,v 1.2 1999/12/04 03:59:12 ralf Exp $ +/* $Id: hardirq.h,v 1.3 2000/02/04 07:40:53 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -20,6 +20,7 @@ extern unsigned int local_irq_count[NR_CPUS]; */ #define in_interrupt() ({ int __cpu = smp_processor_id(); \ (local_irq_count[__cpu] + local_bh_count[__cpu] != 0); }) +#define in_irq() (local_irq_count[smp_processor_id()] != 0) #ifndef __SMP__ |