[openib-general] [PATCH RFC 17/21] ofed_1_2 Backport infiniband/hw/cxgb3/iwch_provider.c to sles9sp3

[Michael S. Tsirkin]

> Quoting Steve Wise <swise at opengridcomputing.com>:
> Subject: [PATCH  RFC 17/21] ofed_1_2 Backport infiniband/hw/cxgb3/iwch_provider.c to sles9sp3
> 
> 
> Backport infiniband/hw/cxgb3/iwch_provider.c to sles9sp3
> 
> Signed-off-by: Steve Wise <swise at opengridcomputing.com>
> ---
> 
>  .../iwch_provider_to_2_6_5-7_244.patch             |   21 +++++++++++++++++++++
>  1 files changed, 21 insertions(+), 0 deletions(-)
> 
> diff --git a/kernel_patches/backport/2.6.5_sles9_sp3/iwch_provider_to_2_6_5-7_244.patch b/kernel_patches/backport/2.6.5_sles9_sp3/iwch_provider_to_2_6_5-7_244.patch
> new file mode 100644
> index 0000000..2375474
> --- /dev/null
> +++ b/kernel_patches/backport/2.6.5_sles9_sp3/iwch_provider_to_2_6_5-7_244.patch
> @@ -0,0 +1,21 @@
> +diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> +index 28be418..86fe3e3 100644
> +--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
> ++++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
> +@@ -347,14 +347,14 @@ static int iwch_mmap(struct ib_ucontext 
> + 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
> + 		vma->vm_flags |= VM_DONTCOPY | VM_DONTEXPAND;
> + 		vma->vm_flags &= ~VM_MAYREAD;
> +-		ret = io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
> ++		ret = io_remap_page_range(vma, vma->vm_start, vma->vm_pgoff << PAGE_SHIFT,
> + 				       len, vma->vm_page_prot);
> + 	} else {
> + 
> + 		/*
> + 		 * Map WQ or CQ contig dma memory...
> + 		 */
> +-		ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
> ++		ret = remap_page_range(vma, vma->vm_start, vma->vm_pgoff << PAGE_SHIFT,
> + 				       len, vma->vm_page_prot);
> + 	}
> + 	

Can we use define in kernel_addons to convert remap_pfn_range to remap_page_range?
I know we do this for mthca too, but maybe this needs fixing there as well.

-- 
MST