From: cl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Date: Sun, 21 Aug 2005 11:40:39 +0000 (+0000)
Subject: Fix fallout from "Get rid of memory_t." checkin.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16885
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3ce6c98f6229c9d2b03a26c24c0b87ed96c7f91c;p=xen.git

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@cl.cam.ac.uk>
---

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index b3bbc7e0db..15c824d3c4 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -75,8 +75,8 @@ __gnttab_activate_grant_ref(
     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 @@ __gnttab_map_grant_ref(
     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 @@ __gnttab_map_grant_ref(
            (!(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 @@ __gnttab_unmap_grant_ref(
     grant_mapping_t *map;
     u16            flags;
     s16            rc = 1;
-    unsigned long  frame, addr;
+    u64 frame, addr;
 
     ld = current->domain;