diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/linux/interrupt.h | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index a6c8e89c2..925e70d20 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -42,19 +42,14 @@ enum { KEYBOARD_BH, CYCLADES_BH, CM206_BH, - JS_BH + JS_BH, + MACSERIAL_BH }; #include <asm/hardirq.h> #include <asm/softirq.h> /* - * Are we in an interrupt context? Either doing bottom half - * or hardware interrupt processing? - */ -#define in_interrupt() (local_irq_count[smp_processor_id()] + local_bh_count[smp_processor_id()] != 0) - -/* * Autoprobing for irqs: * * probe_irq_on() and probe_irq_off() provide robust primitives |