diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2011-02-24 15:33:24 -0500 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-04-28 08:21:03 -0700 |
| commit | 386797ea0e4eb044f6c7433c15d75cb4120f73a7 (patch) | |
| tree | 74dc7d4c2b99d9fe0a4e65cc14e6eb618889b366 /arch | |
| parent | 77b51dedbea56d55f44f3f0ea3f47b784cb04106 (diff) | |
| download | kernel-common-386797ea0e4eb044f6c7433c15d75cb4120f73a7.tar.gz kernel-common-386797ea0e4eb044f6c7433c15d75cb4120f73a7.tar.bz2 kernel-common-386797ea0e4eb044f6c7433c15d75cb4120f73a7.zip | |
tioca: Fix assignment from incompatible pointer warnings
commit b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9 upstream.
The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects
an unsigned long instead of a u64.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 4d4536e3b6f3..9c271be9919a 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c @@ -509,7 +509,7 @@ 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, int dma_flags) +tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags) { u64 mapaddr; |