Revert "xen: Have schedulers revise initial placement"

This reverts commit c421378a8d14c811e5467d535bc71adc0328a316,
as it needs further so far unidentified prereqs.

diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
index 2e11aa27f994c0a3dee9258d54c8ed2ce1260b21..54fd830efba0f5d61f49fb14c455fd91604117c9 100644 (file)
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -892,9 +892,6 @@ csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
     spinlock_t *lock;
     unsigned long flags;
 
-    /* This is safe because vc isn't yet being scheduled */
-    vc->processor = csched_cpu_pick(ops, vc);
-
     lock = vcpu_schedule_lock_irqsave(vc, &flags);
 
     if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running )

diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 7a81db509a49719d006a4a5eeb03e4824b11b70b..db9e1c4a104dde90102ca62238b12fa36c04aa8b 100644 (file)
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -269,7 +269,6 @@ struct csched2_dom {
     uint16_t nr_vcpus;
 };
 
-static int csched2_cpu_pick(const struct scheduler *ops, struct vcpu *vc);
 
 /*
  * Time-to-credit, credit-to-time.
@@ -875,16 +874,9 @@ csched2_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
         /* FIXME: Do we need the private lock here? */
         list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu);
 
-        /* csched2_cpu_pick() expects the pcpu lock to be held */
-        lock = vcpu_schedule_lock_irq(vc);
-
-        vc->processor = csched2_cpu_pick(ops, vc);
-
-        spin_unlock_irq(lock);
-
+        /* Add vcpu to runqueue of initial processor */
         lock = vcpu_schedule_lock_irq(vc);
 
-        /* Add vcpu to runqueue of initial processor */
         runq_assign(ops, vc);
 
         vcpu_schedule_unlock_irq(lock, vc);

diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index bb972fa8f9931cf091c339aa56c868f17cdd36c9..a77e80800a8cc0856b02ade52499590a3aa2a0c9 100644 (file)
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -169,8 +169,6 @@ struct rt_dom {
     struct domain *dom;         /* pointer to upper domain */
 };
 
-static int rt_cpu_pick(const struct scheduler *ops, struct vcpu *vc);
-
 /*
  * Useful inline functions
  */
@@ -556,9 +554,6 @@ rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc)
     if ( is_idle_vcpu(vc) )
         return;
 
-    /* This is safe because vc isn't yet being scheduled */
-    vc->processor = rt_cpu_pick(ops, vc);
-
     lock = vcpu_schedule_lock_irq(vc);
 
     now = NOW();