diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c
index 17e7f52169..44f586b47b 100644
--- a/xen/common/sched/core.c
+++ b/xen/common/sched/core.c
@@ -1563,20 +1563,20 @@ static long do_poll(const struct sched_poll *sched_poll)
 /* Voluntarily yield the processor for this allocation. */
 long vcpu_yield(void)
 {
-    struct vcpu *curr = current;
+    struct vcpu * v=current;
     spinlock_t *lock;
 
     rcu_read_lock(&sched_res_rculock);
 
-    lock = unit_schedule_lock_irq(curr->sched_unit);
-    sched_yield(vcpu_scheduler(curr), curr->sched_unit);
-    unit_schedule_unlock_irq(lock, curr->sched_unit);
+    lock = unit_schedule_lock_irq(v->sched_unit);
+    sched_yield(vcpu_scheduler(v), v->sched_unit);
+    unit_schedule_unlock_irq(lock, v->sched_unit);
 
     rcu_read_unlock(&sched_res_rculock);
 
     SCHED_STAT_CRANK(vcpu_yield);
 
-    TRACE_TIME(TRC_SCHED_YIELD, curr->domain->domain_id, curr->vcpu_id);
+    TRACE_TIME(TRC_SCHED_YIELD, current->domain->domain_id, current->vcpu_id);
     raise_softirq(SCHEDULE_SOFTIRQ);
     return 0;
 }
@@ -1946,8 +1946,6 @@ typedef long ret_t;
 
 ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
 {
-    const struct vcpu *curr = current;
-    struct domain *currd = curr->domain;
     ret_t ret = 0;
 
     switch ( cmd )
@@ -1972,9 +1970,9 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
         if ( copy_from_guest(&sched_shutdown, arg, 1) )
             break;
 
-        TRACE_TIME(TRC_SCHED_SHUTDOWN, currd->domain_id, curr->vcpu_id,
-                   sched_shutdown.reason);
-        ret = domain_shutdown(currd, sched_shutdown.reason);
+        TRACE_TIME(TRC_SCHED_SHUTDOWN, current->domain->domain_id,
+                   current->vcpu_id, sched_shutdown.reason);
+        ret = domain_shutdown(current->domain, (u8)sched_shutdown.reason);
 
         break;
     }
@@ -1982,18 +1980,19 @@ ret_t do_sched_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg)
     case SCHEDOP_shutdown_code:
     {
         struct sched_shutdown sched_shutdown;
+        struct domain *d = current->domain;
 
         ret = -EFAULT;
         if ( copy_from_guest(&sched_shutdown, arg, 1) )
             break;
 
-        TRACE_TIME(TRC_SCHED_SHUTDOWN_CODE, currd->domain_id, curr->vcpu_id,
+        TRACE_TIME(TRC_SCHED_SHUTDOWN_CODE, d->domain_id, current->vcpu_id,
                    sched_shutdown.reason);
 
-        spin_lock(&currd->shutdown_lock);
-        if ( currd->shutdown_code == SHUTDOWN_CODE_INVALID )
-            currd->shutdown_code = (uint8_t)sched_shutdown.reason;
-        spin_unlock(&currd->shutdown_lock);
+        spin_lock(&d->shutdown_lock);
+        if ( d->shutdown_code == SHUTDOWN_CODE_INVALID )
+            d->shutdown_code = (u8)sched_shutdown.reason;
+        spin_unlock(&d->shutdown_lock);
 
         ret = 0;
         break;