ia64/xen-unstable

changeset 9398:9897a5e6385d

[IA64] fix PRtype_info and removed some warning

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Fri Mar 24 10:32:35 2006 -0700 (2006-03-24)
parents 0f615d43a789
children 80eaf1cb8903
files xen/arch/ia64/xen/xenmisc.c xen/include/asm-ia64/mm.h
line diff
     1.1 --- a/xen/arch/ia64/xen/xenmisc.c	Fri Mar 24 10:27:05 2006 -0700
     1.2 +++ b/xen/arch/ia64/xen/xenmisc.c	Fri Mar 24 10:32:35 2006 -0700
     1.3 @@ -539,9 +539,8 @@ int get_page_type(struct page_info *page
     1.4                      }
     1.5                      if ( ((x & PGT_type_mask) != PGT_l2_page_table) ||
     1.6                           ((type & PGT_type_mask) != PGT_l1_page_table) )
     1.7 -                        MEM_LOG("Bad type (saw %" PRtype_info
     1.8 -                                " != exp %" PRtype_info ") "
     1.9 -                                "for mfn %lx (pfn %lx)",
    1.10 +                        MEM_LOG("Bad type (saw %08x != exp %08x) "
    1.11 +                                "for mfn %016lx (pfn %016lx)",
    1.12                                  x, type, page_to_mfn(page),
    1.13                                  get_gpfn_from_mfn(page_to_mfn(page)));
    1.14                      return 0;
    1.15 @@ -581,8 +580,8 @@ int get_page_type(struct page_info *page
    1.16          /* Try to validate page type; drop the new reference on failure. */
    1.17          if ( unlikely(!alloc_page_type(page, type)) )
    1.18          {
    1.19 -            MEM_LOG("Error while validating mfn %lx (pfn %lx) for type %"
    1.20 -                    PRtype_info ": caf=%08x taf=%" PRtype_info,
    1.21 +            MEM_LOG("Error while validating mfn %lx (pfn %lx) for type %08x"
    1.22 +                    ": caf=%08x taf=%" PRtype_info,
    1.23                      page_to_mfn(page), get_gpfn_from_mfn(page_to_mfn(page)),
    1.24                      type, page->count_info, page->u.inuse.type_info);
    1.25              /* Noone else can get a reference. We hold the only ref. */
     2.1 --- a/xen/include/asm-ia64/mm.h	Fri Mar 24 10:27:05 2006 -0700
     2.2 +++ b/xen/include/asm-ia64/mm.h	Fri Mar 24 10:32:35 2006 -0700
     2.3 @@ -32,7 +32,7 @@ typedef unsigned long page_flags_t;
     2.4   */
     2.5  #define PFN_ORDER(_pfn)	((_pfn)->u.free.order)
     2.6  
     2.7 -#define PRtype_info "08x"
     2.8 +#define PRtype_info "016lx"
     2.9  
    2.10  struct page_info
    2.11  {
    2.12 @@ -175,9 +175,10 @@ static inline int get_page(struct page_i
    2.13  	if (unlikely((x & PGC_count_mask) == 0) ||	/* Not allocated? */
    2.14  	    unlikely((nx & PGC_count_mask) == 0) ||	/* Count overflow? */
    2.15  	    unlikely((x >> 32) != _domain)) {		/* Wrong owner? */
    2.16 -	    DPRINTK("Error pfn %lx: rd=%p, od=%p, caf=%08x, taf=%08x\n",
    2.17 -		page_to_mfn(page), domain, unpickle_domptr(domain),
    2.18 -		x, page->u.inuse.type_info);
    2.19 +
    2.20 +	    DPRINTK("Error pfn %lx: rd=%p, od=%p, caf=%016lx, taf=%"
    2.21 +		PRtype_info "\n", page_to_mfn(page), domain,
    2.22 +		unpickle_domptr(x >> 32), x, page->u.inuse.type_info);
    2.23  	    return 0;
    2.24  	}
    2.25      }