diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
tree | 022276b3625a432c7132e39776e7e448445087ac /arch/ia64/sn/pci | |
parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/sn/pci')
-rw-r--r-- | arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 | ||||
-rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_dma.c b/arch/ia64/sn/pci/pcibr/pcibr_dma.c index c90685985d81..64af2b2c1787 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_dma.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_dma.c | |||
@@ -301,7 +301,7 @@ void sn_dma_flush(uint64_t addr) | |||
301 | spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> | 301 | spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> |
302 | sfdl_flush_lock, flags); | 302 | sfdl_flush_lock, flags); |
303 | 303 | ||
304 | p->sfdl_flush_value = 0; | 304 | *p->sfdl_flush_addr = 0; |
305 | 305 | ||
306 | /* force an interrupt. */ | 306 | /* force an interrupt. */ |
307 | *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; | 307 | *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 54a0dd447e76..8dae9eb45456 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -431,7 +431,7 @@ tioca_dma_mapped(struct pci_dev *pdev, uint64_t paddr, size_t req_size) | |||
431 | ca_dmamap->cad_dma_addr = bus_addr; | 431 | ca_dmamap->cad_dma_addr = bus_addr; |
432 | ca_dmamap->cad_gart_size = entries; | 432 | ca_dmamap->cad_gart_size = entries; |
433 | ca_dmamap->cad_gart_entry = entry; | 433 | ca_dmamap->cad_gart_entry = entry; |
434 | list_add(&ca_dmamap->cad_list, &tioca_kern->ca_list); | 434 | list_add(&ca_dmamap->cad_list, &tioca_kern->ca_dmamaps); |
435 | 435 | ||
436 | if (xio_addr % ps) { | 436 | if (xio_addr % ps) { |
437 | tioca_kern->ca_pcigart[entry] = tioca_paddr_to_gart(xio_addr); | 437 | tioca_kern->ca_pcigart[entry] = tioca_paddr_to_gart(xio_addr); |