2010-07-07 11:12:45 +00:00
|
|
|
From: Jeff Mahoney <jeffm@suse.com>
|
|
|
|
|
Subject: tioca: Fix assignment from incompatible pointer warnings
|
2011-04-19 20:09:59 +00:00
|
|
|
Patch-mainline: Submitted 24 Feb 2011
|
2010-07-07 11:12:45 +00:00
|
|
|
|
|
|
|
|
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>
|
|
|
|
|
---
|
|
|
|
|
arch/ia64/sn/pci/tioca_provider.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/arch/ia64/sn/pci/tioca_provider.c
|
|
|
|
|
+++ b/arch/ia64/sn/pci/tioca_provider.c
|
2011-04-19 20:09:59 +00:00
|
|
|
@@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dm
|
2010-07-07 11:12:45 +00:00
|
|
|
* 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;
|
|
|
|
|
|
