[Xen-changelog] Missed ia64 changes to one drivers/xen file

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

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID b547291cb6d44a21cf145fbd9fd1e4e0579c3b98
# Parent  b6cce4237dedfcdbfdec30c232a5b7113efc3585
Missed ia64 changes to one drivers/xen file

diff -r b6cce4237ded -r b547291cb6d4 
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Mon Nov  7 
17:13:38 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c        Mon Nov  7 
17:25:59 2005
@@ -181,6 +181,15 @@
                for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) {
                        if (get_user(mfn, p))
                                return -EFAULT;
+#ifdef __ia64__
+                       ret = remap_pfn_range(vma,
+                                             addr&PAGE_MASK,
+                                             mfn,
+                                             1<<PAGE_SHIFT,
+                                             vma->vm_page_prot);
+                       if (ret < 0)
+                           goto batch_err;
+#else
 
                        ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep);
                        if (ret)
@@ -191,6 +200,7 @@
 
                        if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0)
                                put_user(0xF0000000 | mfn, p);
+#endif
                }
 
                ret = 0;
@@ -206,6 +216,7 @@
        break;
 #endif
 
+#ifndef __ia64__
        case IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN: {
                unsigned long m2pv = (unsigned long)machine_to_phys_mapping;
                pgd_t *pgd = pgd_offset_k(m2pv);
@@ -217,6 +228,7 @@
                        -EFAULT: 0;
        }
        break;
+#endif
 
        default:
                ret = -EINVAL;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog