Revert debugging patch c/s 19344.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index fbc75cbddec1cdf1a9046b18c236ba5a6c18a9ff..eb07404e7afc4704eb8fd52ace311077de6e1d6b 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -403,9 +403,6 @@ static struct page_info *alloc_heap_pages(
     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 --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 69604cebcec76a96259aef1ad73c6e7d714dc2ed..70da6264165da870f1efe9dbb7e89cc5e7e61499 100644 (file)
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -237,8 +237,6 @@ long do_sysctl(XEN_GUEST_HANDLE(xen_sysctl_t) u_sysctl)
         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));