diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 10:24:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 10:24:51 -0700 |
| commit | 043d051615aa5da09a7e44f1edbb69798458e067 (patch) | |
| tree | a0bfe7f6ed6efa4e0eb7f6b9891a0dc3f2fafe57 /include/asm-ia64/sn/intr.h | |
| parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) | |
| parent | 21517a57e838a1fbb7a54a8a77501024e77f83e0 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/intr.h')
| -rw-r--r-- | include/asm-ia64/sn/intr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h index e51471fb086..e190dd4213d 100644 --- a/include/asm-ia64/sn/intr.h +++ b/include/asm-ia64/sn/intr.h @@ -9,6 +9,8 @@ #ifndef _ASM_IA64_SN_INTR_H #define _ASM_IA64_SN_INTR_H +#include <linux/rcupdate.h> + #define SGI_UART_VECTOR (0xe9) #define SGI_PCIBR_ERROR (0x33) @@ -33,7 +35,7 @@ // The SN PROM irq struct struct sn_irq_info { - struct sn_irq_info *irq_next; /* sharing irq list */ + struct sn_irq_info *irq_next; /* deprecated DO NOT USE */ short irq_nasid; /* Nasid IRQ is assigned to */ int irq_slice; /* slice IRQ is assigned to */ int irq_cpuid; /* kernel logical cpuid */ @@ -47,6 +49,8 @@ struct sn_irq_info { int irq_cookie; /* unique cookie */ int irq_flags; /* flags */ int irq_share_cnt; /* num devices sharing IRQ */ + struct list_head list; /* list of sn_irq_info structs */ + struct rcu_head rcu; /* rcu callback list */ }; extern void sn_send_IPI_phys(int, long, int, int); |