diff options
| author | Keir Fraser <keir@xen.org> | 2011-03-05 11:25:30 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-03-05 11:25:30 +0000 |
| commit | 944c704356e71439b525f425103583d4bf856404 (patch) | |
| tree | 179215ff82e6e7c9b50aa1c9a92006d7c453baf1 | |
| parent | bc004a5b0808167e685c1e1717b7052567f5c106 (diff) | |
| download | xen-944c704356e71439b525f425103583d4bf856404.tar.gz xen-944c704356e71439b525f425103583d4bf856404.tar.bz2 xen-944c704356e71439b525f425103583d4bf856404.zip | |
credit2: Revert debugging patch 22965:9dfd7ffcd76c for release.
Signed-off-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/common/sched_credit2.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c index 59c13618ed..c28f009996 100644 --- a/xen/common/sched_credit2.c +++ b/xen/common/sched_credit2.c @@ -808,7 +808,6 @@ static void __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 @@ csched_schedule( /* 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 */ |