direct-io.hg

changeset 15527:87a15869d43b

Fix compile error in x86_64
author Guy Zana <guy@neocleus.com>
date Thu Aug 16 05:42:24 2007 -0400 (2007-08-16)
parents 13483c74ce04
children 2665a74a1351
files xen/arch/x86/hvm/io.c xen/arch/x86/pt/mm_early.c
line diff
     1.1 --- a/xen/arch/x86/hvm/io.c	Mon Aug 13 17:49:00 2007 -0400
     1.2 +++ b/xen/arch/x86/hvm/io.c	Thu Aug 16 05:42:24 2007 -0400
     1.3 @@ -896,7 +896,7 @@ void dpci_ioport_read(uint32_t mport, io
     1.4              z_data = (uint64_t)inl(mport);
     1.5              break;
     1.6          default:
     1.7 -            gdprintk(XENLOG_ERR, "Error: unable to handle size: %Lu", p->size);
     1.8 +            gdprintk(XENLOG_ERR, "Error: unable to handle size: %" PRId64 "\n", p->size);
     1.9              goto out;
    1.10          }
    1.11          
    1.12 @@ -947,7 +947,7 @@ void dpci_ioport_write(uint32_t mport, i
    1.13              outl((uint32_t) z_data, mport);
    1.14              break;
    1.15          default:
    1.16 -            gdprintk(XENLOG_ERR, "Error: unable to handle size: %Lu\n", p->size);
    1.17 +            gdprintk(XENLOG_ERR, "Error: unable to handle size: %" PRId64 "\n", p->size);
    1.18              goto out;
    1.19          }
    1.20      }
     2.1 --- a/xen/arch/x86/pt/mm_early.c	Mon Aug 13 17:49:00 2007 -0400
     2.2 +++ b/xen/arch/x86/pt/mm_early.c	Thu Aug 16 05:42:24 2007 -0400
     2.3 @@ -153,8 +153,8 @@ int __init nd_alloc_xen_portion(void)
     2.4      if ( xen_portion > (MM_XEN_PORTION_OF_RAM_MAXIMUM_MB<<20) )
     2.5          xen_portion = (MM_XEN_PORTION_OF_RAM_MAXIMUM_MB<<20);
     2.6  
     2.7 -    printk("NativeDom: Machine Available RAM: %Lu\n", avail_ram);
     2.8 -    printk("NativeDom: RAM Available for Xen: %Lu\n", xen_portion);
     2.9 +    printk("NativeDom: Machine Available RAM: %" PRId64 "\n", avail_ram);
    2.10 +    printk("NativeDom: RAM Available for Xen: %" PRId64 "\n", xen_portion);
    2.11  
    2.12      /* Walk the e820 table (top down) and allocate portions for Xen */
    2.13      for (i=(e820.nr_map-1); i >= 0 , xen_portion > 0; i--)
    2.14 @@ -278,7 +278,7 @@ int __init nd_remap_areas(void)
    2.15          return -1;		
    2.16      }
    2.17  
    2.18 -    printk("NativeDom: Remapped region address: 0x%Lx\n", dup_addr_base);
    2.19 +    printk("NativeDom: Remapped region address: 0x%016" PRIx64 "\n", dup_addr_base);
    2.20  
    2.21      /* First 12MB of memory */
    2.22      nd_areas.dups.nr++;
    2.23 @@ -480,7 +480,7 @@ int  __init nd_init_protected_areas(void
    2.24                  return -1;
    2.25              }
    2.26  
    2.27 -            printk("NativeDom: Protected Area: %016Lx - %016Lx\n", 
    2.28 +            printk("NativeDom: Protected Area: %016" PRIx64 " - %016" PRIx64 "\n", 
    2.29                  e820.map[i].addr, e820.map[i].addr+e820.map[i].size);
    2.30          }
    2.31      }
    2.32 @@ -492,7 +492,7 @@ int  __init nd_init_protected_areas(void
    2.33          return -1;
    2.34      }
    2.35  
    2.36 -    printk("NativeDom: Protected Area: %016Lx - %016Lx (duplicated)\n", 
    2.37 +    printk("NativeDom: Protected Area: %016" PRIx64 " - %016" PRIx64 " (remapped)\n", 
    2.38          dup_addr_base, dup_addr_base+total_dup_size);
    2.39  
    2.40      return 0;