ia64/xen-unstable

changeset 6320:342ccfca85d7

Fix debug build.
author kaf24@firebug.cl.cam.ac.uk
date Sun Aug 21 16:24:23 2005 +0000 (2005-08-21)
parents dc8380497e98
children eb2c985e88be
files xen/common/grant_table.c
line diff
     1.1 --- a/xen/common/grant_table.c	Sun Aug 21 12:24:21 2005 +0000
     1.2 +++ b/xen/common/grant_table.c	Sun Aug 21 16:24:23 2005 +0000
     1.3 @@ -70,13 +70,13 @@ put_maptrack_handle(
     1.4  
     1.5  static int
     1.6  __gnttab_activate_grant_ref(
     1.7 -    struct domain          *mapping_d,          /* IN */
     1.8 +    struct domain   *mapping_d,          /* IN */
     1.9      struct vcpu     *mapping_ed,
    1.10 -    struct domain          *granting_d,
    1.11 -    grant_ref_t             ref,
    1.12 -    u16                     dev_hst_ro_flags,
    1.13 -    u64           addr,
    1.14 -    u64          *pframe )            /* OUT */
    1.15 +    struct domain   *granting_d,
    1.16 +    grant_ref_t      ref,
    1.17 +    u16              dev_hst_ro_flags,
    1.18 +    u64              addr,
    1.19 +    u64             *pframe )            /* OUT */
    1.20  {
    1.21      domid_t               sdom;
    1.22      u16                   sflags;
    1.23 @@ -342,7 +342,7 @@ static int
    1.24      struct vcpu          *led;
    1.25      u16                   dev_hst_ro_flags;
    1.26      int                   handle;
    1.27 -    u64 frame = 0, addr;
    1.28 +    u64                   frame = 0, addr;
    1.29      int                   rc;
    1.30  
    1.31      led = current;
    1.32 @@ -363,7 +363,7 @@ static int
    1.33             (!(dev_hst_ro_flags & GNTMAP_contains_pte) && 
    1.34              unlikely(!__addr_ok(addr))) ) )
    1.35      {
    1.36 -        DPRINTK("Bad virtual address (%llx) or flags (%x).\n",
    1.37 +        DPRINTK("Bad virtual address (%"PRIx64") or flags (%"PRIx16").\n",
    1.38                  addr, dev_hst_ro_flags);
    1.39          (void)__put_user(GNTST_bad_virt_addr, &uop->handle);
    1.40          return GNTST_bad_gntref;
    1.41 @@ -496,13 +496,12 @@ static int
    1.42      grant_ref_t    ref;
    1.43      u16            handle;
    1.44      struct domain *ld, *rd;
    1.45 -
    1.46      active_grant_entry_t *act;
    1.47      grant_entry_t *sha;
    1.48      grant_mapping_t *map;
    1.49      u16            flags;
    1.50      s16            rc = 1;
    1.51 -    u64 frame, addr;
    1.52 +    u64            frame, addr;
    1.53  
    1.54      ld = current->domain;
    1.55