[Xen-changelog] Fix an incorrect type, and a missing return value check,

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 2b4b1963b76e5a9503304f3cd690fb8358a57b4e
# Parent  71914b64b5770285cf095c1906e346b814f4878b
Fix an incorrect type, and a missing return value check,
in direct_remap_pfn_range().

Signed-off-by: Jan Beulich <JBeulich@xxxxxxxxxx>

diff -r 71914b64b577 -r 2b4b1963b76e 
linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c   Tue Jan 24 17:05:45 2006
+++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/ioremap.c   Tue Jan 24 17:08:11 2006
@@ -52,8 +52,8 @@
                                    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 @@
 
        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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog