diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/linux/interrupt.h | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r-- | include/linux/interrupt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 925e70d20..aa157d4a5 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -17,7 +17,7 @@ struct irqaction { extern volatile unsigned char bh_running; -extern int bh_mask_count[32]; +extern atomic_t bh_mask_count[32]; extern unsigned long bh_active; extern unsigned long bh_mask; extern void (*bh_base[32])(void); @@ -43,7 +43,8 @@ enum { CYCLADES_BH, CM206_BH, JS_BH, - MACSERIAL_BH + MACSERIAL_BH, + ISICOM_BH }; #include <asm/hardirq.h> |