ia64/xen-unstable

changeset 19380:92a6cc5eae2e

Revert debugging patch c/s 19344.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 17 15:29:57 2009 +0000 (2009-03-17)
parents e655cb27d085
children 9fc957e63f8d
files xen/common/page_alloc.c xen/common/sysctl.c
line diff
     1.1 --- a/xen/common/page_alloc.c	Tue Mar 17 15:29:20 2009 +0000
     1.2 +++ b/xen/common/page_alloc.c	Tue Mar 17 15:29:57 2009 +0000
     1.3 @@ -403,9 +403,6 @@ static struct page_info *alloc_heap_page
     1.4      for ( i = 0; i < (1 << order); i++ )
     1.5      {
     1.6          /* Reference count must continuously be zero for free pages. */
     1.7 -        if ( pg[i].count_info != 0 )
     1.8 -            printk("** %s:%d -- %u/%u %lx\n", __FILE__, __LINE__,
     1.9 -                   i, 1 << order, pg[i].count_info);
    1.10          BUG_ON(pg[i].count_info != 0);
    1.11  
    1.12          if ( pg[i].u.free.need_tlbflush )
    1.13 @@ -530,10 +527,7 @@ static void free_heap_pages(
    1.14           *     in its pseudophysical address space).
    1.15           * In all the above cases there can be no guest mappings of this page.
    1.16           */
    1.17 -        if ( pg[i].count_info & PGC_offlined )
    1.18 -            printk("** %s:%d -- %u/%u %lx\n", __FILE__, __LINE__,
    1.19 -                   i, 1 << order, pg[i].count_info);
    1.20 -        BUG_ON(pg[i].count_info & PGC_offlined);
    1.21 +        ASSERT(!(pg[i].count_info & PGC_offlined));
    1.22          pg[i].count_info &= PGC_offlining | PGC_broken;
    1.23          if ( pg[i].count_info & PGC_offlining )
    1.24          {
     2.1 --- a/xen/common/sysctl.c	Tue Mar 17 15:29:20 2009 +0000
     2.2 +++ b/xen/common/sysctl.c	Tue Mar 17 15:29:57 2009 +0000
     2.3 @@ -237,8 +237,6 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysc
     2.4          uint32_t *status, *ptr;
     2.5          unsigned long pfn;
     2.6  
     2.7 -        BUG();
     2.8 -
     2.9          ptr = status = xmalloc_bytes( sizeof(uint32_t) *
    2.10                                  (op->u.page_offline.end -
    2.11                                    op->u.page_offline.start + 1));