Index: linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c
===================================================================
--- linux-2.6-xen-sparse.orig/arch/i386/mm/ioremap-xen.c
+++ linux-2.6-xen-sparse/arch/i386/mm/ioremap-xen.c
@@ -56,6 +56,9 @@ static int __direct_remap_pfn_range(stru
 	unsigned long i, start_address;
 	mmu_update_t *u, *v, *w;
 
+	if (unlikely(!size))
+		return 0;
+
 	u = v = w = (mmu_update_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);
 	if (u == NULL)
 		return -ENOMEM;
@@ -91,17 +94,15 @@ static int __direct_remap_pfn_range(stru
 		v++;
 	}
 
-	if (v != u) {
-		/* get the ptep's filled in */
-		rc = apply_to_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;
-	}
+	/* get the ptep's filled in */
+	rc = apply_to_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;
 
 	rc = 0;