Skip to contentSkip to conversation

x86 linux ioremap adjustment

PATCH New Jan Beulich 1 participant 1 message Jan 24, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86 linux ioremap adjustment

This fixes an incorrect type, and a missing return value check. Jan

arch/xen/i386/mm/ioremap.c +5 -3
Index: head-2006-01-23/arch/xen/i386/mm/ioremap.c
===================================================================
@@ -52,8 +52,8 @@ static int __direct_remap_pfn_range(stru
 				    pgprot_t prot,
 				    domid_t  domid)
 {
-	int i, rc;
-	unsigned long start_address;
+	int rc;
+	unsigned long i, start_address;
 	mmu_update_t *u, *v, *w;
 
 	u = v = w = (mmu_update_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
@@ -93,8 +93,10 @@ static int __direct_remap_pfn_range(stru
 
 	if (v != u) {
 		/* get the ptep's filled in */
-		generic_page_range(mm, start_address, address - start_address,
+		rc = generic_page_range(mm, start_address, address - start_address,
 				   direct_remap_area_pte_fn, &w);
+		if (rc)
+			goto out;
 		rc = -EFAULT;
 		if (unlikely(HYPERVISOR_mmu_update(u, v - u, NULL, domid) < 0))
 			goto out;

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel