[Xen-changelog] [xen-4.1-testing] credit2: Revert debugging patch 22965:9dfd7ffcd76c for release.

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1299324330 0
# Node ID 6af8e01d3e4a5b4c6b38c64ceb1cdce897cc8ff2
# Parent  ddc214f425d3650c02c80b057c22b3e32912bc24
credit2: Revert debugging patch 22965:9dfd7ffcd76c for release.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r ddc214f425d3 -r 6af8e01d3e4a xen/common/sched_credit2.c
--- a/xen/common/sched_credit2.c        Fri Mar 04 21:46:06 2011 +0000
+++ b/xen/common/sched_credit2.c        Sat Mar 05 11:25:30 2011 +0000
@@ -808,7 +808,6 @@
 __runq_deassign(struct csched_vcpu *svc)
 {
     BUG_ON(__vcpu_on_runq(svc));
-    BUG_ON(test_bit(__CSFLAG_scheduled, &svc->flags));
 
     list_del_init(&svc->rqd_elem);
     update_max_weight(svc->rqd, 0, svc->weight);
@@ -1604,31 +1603,6 @@
 
     /* Protected by runqueue lock */        
 
-    /* DEBUG */
-    if ( !is_idle_vcpu(scurr->vcpu) && scurr->rqd != rqd)
-    {
-        int other_rqi = -1, this_rqi = c2r(ops, cpu);
-
-        if ( scurr->rqd )
-        {
-            int rq;
-            other_rqi = -2;
-            for_each_cpu_mask ( rq, CSCHED_PRIV(ops)->active_queues )
-            {
-                if ( scurr->rqd == &CSCHED_PRIV(ops)->rqd[rq] )
-                {
-                    other_rqi = rq;
-                    break;
-                }
-            }
-        }
-        printk("%s: pcpu %d rq %d, but scurr d%dv%d assigned to "
-               "pcpu %d rq %d!\n",
-               __func__,
-               cpu, this_rqi,
-               scurr->vcpu->domain->domain_id, scurr->vcpu->vcpu_id,
-               scurr->vcpu->processor, other_rqi);
-    }
     BUG_ON(!is_idle_vcpu(scurr->vcpu) && scurr->rqd != rqd);
 
     /* Clear "tickled" bit now that we've been scheduled */

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