diff options
author | Mark Maule <maule@sgi.com> | 2005-08-03 17:06:00 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-08-11 18:36:39 -0400 |
commit | 735e60f4c67823a3e01655c990296e2e56574885 (patch) | |
tree | eedca515f820a1310937a629d8f95fc0833235e9 /include/asm-ia64/sn | |
parent | 89963d16dc50a5d91ed09914a1232d59e6461fd6 (diff) |
[IA64-SGI] abstract force_interrupt() mechanism
Altix patch to abstract the force_interrupt() mechanism away from the
pcibr provider.
Signed-off-by: Mark Maule <maule@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'include/asm-ia64/sn')
-rw-r--r-- | include/asm-ia64/sn/pcibus_provider_defs.h | 1 | ||||
-rw-r--r-- | include/asm-ia64/sn/pda.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/include/asm-ia64/sn/pcibus_provider_defs.h index b01b21eec55a..5c3ba5708e82 100644 --- a/include/asm-ia64/sn/pcibus_provider_defs.h +++ b/include/asm-ia64/sn/pcibus_provider_defs.h | |||
@@ -48,6 +48,7 @@ struct sn_pcibus_provider { | |||
48 | dma_addr_t (*dma_map_consistent)(struct pci_dev *, unsigned long, size_t); | 48 | dma_addr_t (*dma_map_consistent)(struct pci_dev *, unsigned long, size_t); |
49 | void (*dma_unmap)(struct pci_dev *, dma_addr_t, int); | 49 | void (*dma_unmap)(struct pci_dev *, dma_addr_t, int); |
50 | void * (*bus_fixup)(struct pcibus_bussoft *, struct pci_controller *); | 50 | void * (*bus_fixup)(struct pcibus_bussoft *, struct pci_controller *); |
51 | void (*force_interrupt)(struct sn_irq_info *); | ||
51 | }; | 52 | }; |
52 | 53 | ||
53 | extern struct sn_pcibus_provider *sn_pci_provider[]; | 54 | extern struct sn_pcibus_provider *sn_pci_provider[]; |
diff --git a/include/asm-ia64/sn/pda.h b/include/asm-ia64/sn/pda.h index ea5590c76ca4..1c5108d44d8b 100644 --- a/include/asm-ia64/sn/pda.h +++ b/include/asm-ia64/sn/pda.h | |||
@@ -39,7 +39,6 @@ typedef struct pda_s { | |||
39 | unsigned long pio_write_status_val; | 39 | unsigned long pio_write_status_val; |
40 | volatile unsigned long *pio_shub_war_cam_addr; | 40 | volatile unsigned long *pio_shub_war_cam_addr; |
41 | 41 | ||
42 | unsigned long sn_soft_irr[4]; | ||
43 | unsigned long sn_in_service_ivecs[4]; | 42 | unsigned long sn_in_service_ivecs[4]; |
44 | int sn_lb_int_war_ticks; | 43 | int sn_lb_int_war_ticks; |
45 | int sn_last_irq; | 44 | int sn_last_irq; |