mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
Revert "xen: Have schedulers revise initial placement"
This reverts commit c421378a8d,
as it needs further so far unidentified prereqs.
This commit is contained in:
1 parent
0fc8aab8a9
commit
08313b45bf
3 files changed
+2
-18
No files matched your search
@@ -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 )
|
||||
|
||||
@@ -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);
|
||||
|
||||
lock = vcpu_schedule_lock_irq(vc);
|
||||
|
||||
/* Add vcpu to runqueue of initial processor */
|
||||
lock = vcpu_schedule_lock_irq(vc);
|
||||
|
||||
runq_assign(ops, vc);
|
||||
|
||||
vcpu_schedule_unlock_irq(lock, vc);
|
||||
|
||||
@@ -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();
|
||||
|
||||