# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 9897a5e6385dc0d7252db1de72a78ae9861df345
# Parent 0f615d43a7898f0de0be8a76dd6be1cc1cfeaf08
[IA64] fix PRtype_info and removed some warning
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
diff -r 0f615d43a789 -r 9897a5e6385d xen/arch/ia64/xen/xenmisc.c
--- a/xen/arch/ia64/xen/xenmisc.c Fri Mar 24 10:27:05 2006 -0700
+++ b/xen/arch/ia64/xen/xenmisc.c Fri Mar 24 10:32:35 2006 -0700
@@ -539,9 +539,8 @@ int get_page_type(struct page_info *page
}
if ( ((x & PGT_type_mask) != PGT_l2_page_table) ||
((type & PGT_type_mask) != PGT_l1_page_table) )
- MEM_LOG("Bad type (saw %" PRtype_info
- " != exp %" PRtype_info ") "
- "for mfn %lx (pfn %lx)",
+ MEM_LOG("Bad type (saw %08x != exp %08x) "
+ "for mfn %016lx (pfn %016lx)",
x, type, page_to_mfn(page),
get_gpfn_from_mfn(page_to_mfn(page)));
return 0;
@@ -581,8 +580,8 @@ int get_page_type(struct page_info *page
/* Try to validate page type; drop the new reference on failure. */
if ( unlikely(!alloc_page_type(page, type)) )
{
- MEM_LOG("Error while validating mfn %lx (pfn %lx) for type %"
- PRtype_info ": caf=%08x taf=%" PRtype_info,
+ MEM_LOG("Error while validating mfn %lx (pfn %lx) for type %08x"
+ ": caf=%08x taf=%" PRtype_info,
page_to_mfn(page), get_gpfn_from_mfn(page_to_mfn(page)),
type, page->count_info, page->u.inuse.type_info);
/* Noone else can get a reference. We hold the only ref. */
diff -r 0f615d43a789 -r 9897a5e6385d xen/include/asm-ia64/mm.h
--- a/xen/include/asm-ia64/mm.h Fri Mar 24 10:27:05 2006 -0700
+++ b/xen/include/asm-ia64/mm.h Fri Mar 24 10:32:35 2006 -0700
@@ -32,7 +32,7 @@ typedef unsigned long page_flags_t;
*/
#define PFN_ORDER(_pfn) ((_pfn)->u.free.order)
-#define PRtype_info "08x"
+#define PRtype_info "016lx"
struct page_info
{
@@ -175,9 +175,10 @@ static inline int get_page(struct page_i
if (unlikely((x & PGC_count_mask) == 0) || /* Not allocated? */
unlikely((nx & PGC_count_mask) == 0) || /* Count overflow? */
unlikely((x >> 32) != _domain)) { /* Wrong owner? */
- DPRINTK("Error pfn %lx: rd=%p, od=%p, caf=%08x, taf=%08x\n",
- page_to_mfn(page), domain, unpickle_domptr(domain),
- x, page->u.inuse.type_info);
+
+ DPRINTK("Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%"
+ PRtype_info "\n", page_to_mfn(page), domain,
+ unpickle_domptr(x >> 32), x, page->u.inuse.type_info);
return 0;
}
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home