[openib-general] [PATCH] Fix to backport infinipath_core.c to 2.6.9

[Woodruff, Robert J]

In trying to backport svn3796 back to 2.6.9, I got a compile error
on infinipath_core.c. Here is a patch that I think fixes the problem,
but have no way to test it. Can you review the patch and if it looks
OK, I will include it in my next set of backport patches ?

woody



diff -Naurp
linux-2.6.9/drivers/infiniband/hw/ipath/ipath_core/infinipath_core.c
linux-2.6.9-openib-drivers-svn3796-fixups/drivers/infiniband/hw/ipath/ip
ath_core/infinipath_core.c
--- linux-2.6.9/drivers/infiniband/hw/ipath/ipath_core/infinipath_core.c
2005-10-17 13:25:44.000000000 -0700
+++
linux-2.6.9-openib-drivers-svn3796-fixups/drivers/infiniband/hw/ipath/ip
ath_core/infinipath_core.c	2005-10-17 16:00:25.000000000 -0700
@@ -1173,7 +1173,6 @@ MODULE_DEVICE_TABLE(pci, infinipath_pci_
 
 static struct pci_driver infinipath_driver = {
 	.name = MODNAME,
-	.owner = THIS_MODULE,
 	.probe = infinipath_init_one,
 	.remove = __devexit_p(infinipath_remove_one),
 	.id_table = infinipath_pci_tbl,
@@ -3143,7 +3142,7 @@ static int ipath_mmap(struct file *fp, s
 					    VM_DONTCOPY | VM_DONTEXPAND
| VM_IO
 					    | VM_SHM | VM_LOCKED;
 					ret =
-			io_remap_pfn_range(vm, vm->vm_start, phys >>
PAGE_SHIFT,
+			remap_page_range(vm, vm->vm_start, phys,
 					   vm->vm_end - vm->vm_start,
 					   vm->vm_page_prot);
 				}
@@ -3202,7 +3201,7 @@ static int ipath_mmap(struct file *fp, s
 						    | VM_IO | VM_SHM |
 						    VM_LOCKED;
 						ret =
-			io_remap_pfn_range(vm, vm->vm_start, phys >>
PAGE_SHIFT,
+			remap_page_range(vm, vm->vm_start, phys,
 					   vm->vm_end - vm->vm_start,
 					   vm->vm_page_prot);
 					}