[Xen-changelog] [xen-unstable] Revert debugging patch c/s 19344.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1237303797 0
# Node ID 92a6cc5eae2e786eff352488377ad9b4282cefd2
# Parent  e655cb27d0857cb4ad45da1fbcef2824706d392e
Revert debugging patch c/s 19344.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/common/page_alloc.c |    8 +-------
 xen/common/sysctl.c     |    2 --
 2 files changed, 1 insertion(+), 9 deletions(-)

diff -r e655cb27d085 -r 92a6cc5eae2e xen/common/page_alloc.c
--- a/xen/common/page_alloc.c   Tue Mar 17 15:29:20 2009 +0000
+++ b/xen/common/page_alloc.c   Tue Mar 17 15:29:57 2009 +0000
@@ -403,9 +403,6 @@ static struct page_info *alloc_heap_page
     for ( i = 0; i < (1 << order); i++ )
     {
         /* Reference count must continuously be zero for free pages. */
-        if ( pg[i].count_info != 0 )
-            printk("** %s:%d -- %u/%u %lx\n", __FILE__, __LINE__,
-                   i, 1 << order, pg[i].count_info);
         BUG_ON(pg[i].count_info != 0);
 
         if ( pg[i].u.free.need_tlbflush )
@@ -530,10 +527,7 @@ static void free_heap_pages(
          *     in its pseudophysical address space).
          * In all the above cases there can be no guest mappings of this page.
          */
-        if ( pg[i].count_info & PGC_offlined )
-            printk("** %s:%d -- %u/%u %lx\n", __FILE__, __LINE__,
-                   i, 1 << order, pg[i].count_info);
-        BUG_ON(pg[i].count_info & PGC_offlined);
+        ASSERT(!(pg[i].count_info & PGC_offlined));
         pg[i].count_info &= PGC_offlining | PGC_broken;
         if ( pg[i].count_info & PGC_offlining )
         {
diff -r e655cb27d085 -r 92a6cc5eae2e xen/common/sysctl.c
--- a/xen/common/sysctl.c       Tue Mar 17 15:29:20 2009 +0000
+++ b/xen/common/sysctl.c       Tue Mar 17 15:29:57 2009 +0000
@@ -237,8 +237,6 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysc
         uint32_t *status, *ptr;
         unsigned long pfn;
 
-        BUG();
-
         ptr = status = xmalloc_bytes( sizeof(uint32_t) *
                                 (op->u.page_offline.end -
                                   op->u.page_offline.start + 1));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog