ia64/xen-unstable

changeset 6317:2d4daffd8a4a

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>
author cl349@firebug.cl.cam.ac.uk
date Sun Aug 21 11:40:39 2005 +0000 (2005-08-21)
parents f7dfaa2af90c
children 6721abf6b16d
files xen/common/grant_table.c
line diff
     1.1 --- a/xen/common/grant_table.c	Sun Aug 21 11:02:00 2005 +0000
     1.2 +++ b/xen/common/grant_table.c	Sun Aug 21 11:40:39 2005 +0000
     1.3 @@ -75,8 +75,8 @@ static int
     1.4      struct domain          *granting_d,
     1.5      grant_ref_t             ref,
     1.6      u16                     dev_hst_ro_flags,
     1.7 -    unsigned long           addr,
     1.8 -    unsigned long          *pframe )            /* OUT */
     1.9 +    u64           addr,
    1.10 +    u64          *pframe )            /* OUT */
    1.11  {
    1.12      domid_t               sdom;
    1.13      u16                   sflags;
    1.14 @@ -342,7 +342,7 @@ static int
    1.15      struct vcpu          *led;
    1.16      u16                   dev_hst_ro_flags;
    1.17      int                   handle;
    1.18 -    unsigned long         frame = 0, addr;
    1.19 +    u64 frame = 0, addr;
    1.20      int                   rc;
    1.21  
    1.22      led = current;
    1.23 @@ -363,7 +363,7 @@ static int
    1.24             (!(dev_hst_ro_flags & GNTMAP_contains_pte) && 
    1.25              unlikely(!__addr_ok(addr))) ) )
    1.26      {
    1.27 -        DPRINTK("Bad virtual address (%lx) or flags (%x).\n",
    1.28 +        DPRINTK("Bad virtual address (%llx) or flags (%x).\n",
    1.29                  addr, dev_hst_ro_flags);
    1.30          (void)__put_user(GNTST_bad_virt_addr, &uop->handle);
    1.31          return GNTST_bad_gntref;
    1.32 @@ -502,7 +502,7 @@ static int
    1.33      grant_mapping_t *map;
    1.34      u16            flags;
    1.35      s16            rc = 1;
    1.36 -    unsigned long  frame, addr;
    1.37 +    u64 frame, addr;
    1.38  
    1.39      ld = current->domain;
    1.40