| Message ID | 1406122643-12028-1-git-send-email-stefano.stabellini@eu.citrix.com |
|---|---|
| State | Accepted |
| Commit | afac868e50ace7e89fcf87d4f079d2185ea4b738 |
| Headers | show |
On 07/23/2014 02:37 PM, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > CC: george.dunlap@eu.citrix.com > CC: JBeulich@suse.com Acked-by: George Dunlap <george.dunlap@eu.citrix.com> > > Changes in v2: > - do not change paramters and return value of do_yield. > --- > xen/common/schedule.c | 6 +++--- > xen/include/xen/sched.h | 1 + > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/xen/common/schedule.c b/xen/common/schedule.c > index e9eb0bc..9a49769 100644 > --- a/xen/common/schedule.c > +++ b/xen/common/schedule.c > @@ -795,7 +795,7 @@ static long do_poll(struct sched_poll *sched_poll) > } > > /* Voluntarily yield the processor for this allocation. */ > -static long do_yield(void) > +long vcpu_yield(void) > { > struct vcpu * v=current; > spinlock_t *lock = vcpu_schedule_lock_irq(v); > @@ -888,7 +888,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) > { > case SCHEDOP_yield: > { > - ret = do_yield(); > + ret = vcpu_yield(); > break; > } > > @@ -925,7 +925,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) > { > case SCHEDOP_yield: > { > - ret = do_yield(); > + ret = vcpu_yield(); > break; > } > > diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h > index 2f876f5..be932cf 100644 > --- a/xen/include/xen/sched.h > +++ b/xen/include/xen/sched.h > @@ -634,6 +634,7 @@ int sched_id(void); > void sched_tick_suspend(void); > void sched_tick_resume(void); > void vcpu_wake(struct vcpu *v); > +long vcpu_yield(void); > void vcpu_sleep_nosync(struct vcpu *v); > void vcpu_sleep_sync(struct vcpu *v); >
diff --git a/xen/common/schedule.c b/xen/common/schedule.c index e9eb0bc..9a49769 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -795,7 +795,7 @@ static long do_poll(struct sched_poll *sched_poll) } /* Voluntarily yield the processor for this allocation. */ -static long do_yield(void) +long vcpu_yield(void) { struct vcpu * v=current; spinlock_t *lock = vcpu_schedule_lock_irq(v); @@ -888,7 +888,7 @@ long do_sched_op_compat(int cmd, unsigned long arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } @@ -925,7 +925,7 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { case SCHEDOP_yield: { - ret = do_yield(); + ret = vcpu_yield(); break; } diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 2f876f5..be932cf 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -634,6 +634,7 @@ int sched_id(void); void sched_tick_suspend(void); void sched_tick_resume(void); void vcpu_wake(struct vcpu *v); +long vcpu_yield(void); void vcpu_sleep_nosync(struct vcpu *v); void vcpu_sleep_sync(struct vcpu *v);
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> CC: george.dunlap@eu.citrix.com CC: JBeulich@suse.com Changes in v2: - do not change paramters and return value of do_yield. --- xen/common/schedule.c | 6 +++--- xen/include/xen/sched.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)