[Xen-changelog] Fix fallout from "Get rid of memory_t." checkin.

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

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 2d4daffd8a4a0fa3e3b47552b387f6a3755b960a
# Parent  f7dfaa2af90c77810091737e65462964cd2ff1ee
Fix fallout from "Get rid of memory_t." checkin.
{get,put}_user of u64 items has to use u64 variables.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r f7dfaa2af90c -r 2d4daffd8a4a xen/common/grant_table.c
--- a/xen/common/grant_table.c  Sun Aug 21 11:02:00 2005
+++ b/xen/common/grant_table.c  Sun Aug 21 11:40:39 2005
@@ -75,8 +75,8 @@
     struct domain          *granting_d,
     grant_ref_t             ref,
     u16                     dev_hst_ro_flags,
-    unsigned long           addr,
-    unsigned long          *pframe )            /* OUT */
+    u64           addr,
+    u64          *pframe )            /* OUT */
 {
     domid_t               sdom;
     u16                   sflags;
@@ -342,7 +342,7 @@
     struct vcpu          *led;
     u16                   dev_hst_ro_flags;
     int                   handle;
-    unsigned long         frame = 0, addr;
+    u64 frame = 0, addr;
     int                   rc;
 
     led = current;
@@ -363,7 +363,7 @@
            (!(dev_hst_ro_flags & GNTMAP_contains_pte) && 
             unlikely(!__addr_ok(addr))) ) )
     {
-        DPRINTK("Bad virtual address (%lx) or flags (%x).\n",
+        DPRINTK("Bad virtual address (%llx) or flags (%x).\n",
                 addr, dev_hst_ro_flags);
         (void)__put_user(GNTST_bad_virt_addr, &uop->handle);
         return GNTST_bad_gntref;
@@ -502,7 +502,7 @@
     grant_mapping_t *map;
     u16            flags;
     s16            rc = 1;
-    unsigned long  frame, addr;
+    u64 frame, addr;
 
     ld = current->domain;
 

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