diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 22:46:23 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 22:46:23 +0200 |
| commit | 8cf60e04a131310199d5776e2f9e915f0c468899 (patch) | |
| tree | 373a68e88e6737713a0a5723d552cdeefffff929 /arch/ia64/sn/pci/tioca_provider.c | |
| parent | Pull rework-memory-attribute-aliasing into release branch (diff) | |
| parent | [PATCH] fix silly ARM non-EABI build error (diff) | |
| download | linux-8cf60e04a131310199d5776e2f9e915f0c468899.tar.xz linux-8cf60e04a131310199d5776e2f9e915f0c468899.zip | |
Auto-update from upstream
Diffstat (limited to 'arch/ia64/sn/pci/tioca_provider.c')
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index be0176912968..20de72791b97 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c @@ -515,11 +515,17 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) * use the GART mapped mode. */ static u64 -tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count) +tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) { u64 mapaddr; /* + * Not supported for now ... + */ + if (dma_flags & SN_DMA_MSI) + return 0; + + /* * If card is 64 or 48 bit addresable, use a direct mapping. 32 * bit direct is so restrictive w.r.t. where the memory resides that * we don't use it even though CA has some support. |