summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-24 00:02:37 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2016-10-24 00:02:37 +0200
commita0756808f53057f340fac28ad7bca7a6404ed829 (patch)
treeddf9a91cceaf32695c6c762e3aee03bf7b14f0b9
parent3ff86d799822a0ea8bb3a213e79d399267a876b2 (diff)
Fix warnings
* i386/i386/seg.h (fill_descriptor): Fix format for vm_offset_t. * i386/i386/xen.h (hyp_free_mfn, hyp_free_page): Fix format for unsigned long.
-rw-r--r--i386/i386/seg.h2
-rw-r--r--i386/i386/xen.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/i386/i386/seg.h b/i386/i386/seg.h
index 163a1c52..6f3d5af9 100644
--- a/i386/i386/seg.h
+++ b/i386/i386/seg.h
@@ -181,7 +181,7 @@ fill_descriptor(struct real_descriptor *_desc, unsigned base, unsigned limit,
desc->base_high = base >> 24;
#ifdef MACH_PV_DESCRIPTORS
if (hyp_do_update_descriptor(kv_to_ma(_desc), *(uint64_t*)desc))
- panic("couldn't update descriptor(%p to %08lx%08lx)\n", (vm_offset_t) kv_to_ma(_desc), *(((unsigned long*)desc)+1), *(unsigned long *)desc);
+ panic("couldn't update descriptor(%lu to %08lx%08lx)\n", (vm_offset_t) kv_to_ma(_desc), *(((unsigned long*)desc)+1), *(unsigned long *)desc);
#endif /* MACH_PV_DESCRIPTORS */
}
diff --git a/i386/i386/xen.h b/i386/i386/xen.h
index b434ddaf..40d8f174 100644
--- a/i386/i386/xen.h
+++ b/i386/i386/xen.h
@@ -204,7 +204,7 @@ MACH_INLINE void hyp_free_mfn(unsigned long mfn)
reservation.address_bits = 0;
reservation.domid = DOMID_SELF;
if (hyp_memory_op(XENMEM_decrease_reservation, kvtolin(&reservation)) != 1)
- panic("couldn't free page %d\n", mfn);
+ panic("couldn't free page %lu\n", mfn);
}
_hypcall4(int, update_va_mapping, unsigned long, va, unsigned long, val_lo, unsigned long, val_hi, unsigned long, flags);
@@ -221,7 +221,7 @@ MACH_INLINE void hyp_free_page(unsigned long pfn, void *va)
#ifdef MACH_PV_PAGETABLES
/* remove from mappings */
if (hyp_do_update_va_mapping(kvtolin(va), 0, UVMF_INVLPG|UVMF_ALL))
- panic("couldn't clear page %d at %p\n", pfn, va);
+ panic("couldn't clear page %lu at %p\n", pfn, va);
#ifdef MACH_PSEUDO_PHYS
/* drop machine page */