diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-29 15:48:51 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-29 15:48:51 -0700 |
| commit | bcdd3a911499abd65bf1f123b2a6ad9c1d5611ea (patch) | |
| tree | a72709cf2686dbfb390f4e8d43be221058562b19 /arch/ia64/sn/pci/tioca_provider.c | |
| parent | b946ecbb11145ae2f375d2d7289a6e7280462b02 (diff) | |
| parent | d1e079b3fc90c7c114f46771e983a72ac8740882 (diff) | |
| download | blackbird-op-linux-bcdd3a911499abd65bf1f123b2a6ad9c1d5611ea.tar.gz blackbird-op-linux-bcdd3a911499abd65bf1f123b2a6ad9c1d5611ea.zip | |
Pull ngam-maule-steiner into release branch
Diffstat (limited to 'arch/ia64/sn/pci/tioca_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 5d76a7581465..ea09c12f0258 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c @@ -559,7 +559,7 @@ tioca_error_intr_handler(int irq, void *arg, struct pt_regs *pt) ret_stuff.status = 0; ret_stuff.v0 = 0; - segment = 0; + segment = soft->ca_common.bs_persist_segment; busnum = soft->ca_common.bs_persist_busnum; SAL_CALL_NOLOCK(ret_stuff, @@ -622,7 +622,8 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont nasid_to_cnodeid(tioca_common->ca_closest_nasid); tioca_common->ca_kernel_private = (uint64_t) tioca_kern; - bus = pci_find_bus(0, tioca_common->ca_common.bs_persist_busnum); + bus = pci_find_bus(tioca_common->ca_common.bs_persist_segment, + tioca_common->ca_common.bs_persist_busnum); BUG_ON(!bus); tioca_kern->ca_devices = &bus->devices; @@ -656,6 +657,8 @@ static struct sn_pcibus_provider tioca_pci_interfaces = { .dma_map_consistent = tioca_dma_map, .dma_unmap = tioca_dma_unmap, .bus_fixup = tioca_bus_fixup, + .force_interrupt = NULL, + .target_interrupt = NULL }; /** |
