ia64/xen-unstable

changeset 2412:b3a8b4facc8f

bitkeeper revision 1.1159.1.123 (41384dfcdRnIRMBS8UnlM1FaR2oMpw)

Don't output warning messages when using a linear pagetable mapping.
author cl349@freefall.cl.cam.ac.uk
date Fri Sep 03 10:57:00 2004 +0000 (2004-09-03)
parents 46161d047e25
children aed97013f9fe
files xen/arch/x86/memory.c xen/include/asm-x86/mm.h
line diff
     1.1 --- a/xen/arch/x86/memory.c	Fri Sep 03 10:56:28 2004 +0000
     1.2 +++ b/xen/arch/x86/memory.c	Fri Sep 03 10:57:00 2004 +0000
     1.3 @@ -309,8 +309,11 @@ static int get_page_and_type_from_pagenr
     1.4  
     1.5      if ( unlikely(!get_page_type(page, type)) )
     1.6      {
     1.7 -        MEM_LOG("Bad page type for pfn %08lx (%08x)", 
     1.8 -                page_nr, page->u.inuse.type_info);
     1.9 +#ifdef VERBOSE
    1.10 +	if (type != PGT_l1_page_table)
    1.11 +	    MEM_LOG("Bad page type for pfn %08lx (%08x)", 
    1.12 +		    page_nr, page->u.inuse.type_info);
    1.13 +#endif
    1.14          put_page(page);
    1.15          return 0;
    1.16      }
     2.1 --- a/xen/include/asm-x86/mm.h	Fri Sep 03 10:56:28 2004 +0000
     2.2 +++ b/xen/include/asm-x86/mm.h	Fri Sep 03 10:57:00 2004 +0000
     2.3 @@ -228,8 +228,12 @@ static inline int get_page_type(struct p
     2.4          }
     2.5          else if ( unlikely((x & PGT_type_mask) != type) )
     2.6          {
     2.7 -            DPRINTK("Unexpected type (saw %08x != exp %08x) for pfn %08lx\n",
     2.8 -                    x & PGT_type_mask, type, page_to_pfn(page));
     2.9 +#ifdef VERBOSE
    2.10 +	    if ((x & PGT_type_mask) != PGT_l2_page_table &&
    2.11 +		type != PGT_l1_page_table)
    2.12 +		DPRINTK("Unexpected type (saw %08x != exp %08x) for pfn %08lx\n",
    2.13 +			x & PGT_type_mask, type, page_to_pfn(page));
    2.14 +#endif
    2.15              return 0;
    2.16          }
    2.17          else if ( unlikely(!(x & PGT_validated)) )