diff options
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 21b701374f72..91760e80e268 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -725,8 +725,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
725 | int r; | 725 | int r; |
726 | sigset_t sigsaved; | 726 | sigset_t sigsaved; |
727 | 727 | ||
728 | vcpu_load(vcpu); | ||
729 | |||
730 | if (vcpu->sigset_active) | 728 | if (vcpu->sigset_active) |
731 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); | 729 | sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved); |
732 | 730 | ||
@@ -748,7 +746,6 @@ out: | |||
748 | if (vcpu->sigset_active) | 746 | if (vcpu->sigset_active) |
749 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); | 747 | sigprocmask(SIG_SETMASK, &sigsaved, NULL); |
750 | 748 | ||
751 | vcpu_put(vcpu); | ||
752 | return r; | 749 | return r; |
753 | } | 750 | } |
754 | 751 | ||
@@ -883,8 +880,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) | |||
883 | struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd); | 880 | struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd); |
884 | int i; | 881 | int i; |
885 | 882 | ||
886 | vcpu_load(vcpu); | ||
887 | |||
888 | for (i = 0; i < 16; i++) { | 883 | for (i = 0; i < 16; i++) { |
889 | vpd->vgr[i] = regs->vpd.vgr[i]; | 884 | vpd->vgr[i] = regs->vpd.vgr[i]; |
890 | vpd->vbgr[i] = regs->vpd.vbgr[i]; | 885 | vpd->vbgr[i] = regs->vpd.vbgr[i]; |
@@ -931,8 +926,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) | |||
931 | vcpu->arch.itc_offset = regs->saved_itc - kvm_get_itc(vcpu); | 926 | vcpu->arch.itc_offset = regs->saved_itc - kvm_get_itc(vcpu); |
932 | set_bit(KVM_REQ_RESUME, &vcpu->requests); | 927 | set_bit(KVM_REQ_RESUME, &vcpu->requests); |
933 | 928 | ||
934 | vcpu_put(vcpu); | ||
935 | |||
936 | return 0; | 929 | return 0; |
937 | } | 930 | } |
938 | 931 | ||
@@ -1967,9 +1960,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) | |||
1967 | int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, | 1960 | int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu, |
1968 | struct kvm_mp_state *mp_state) | 1961 | struct kvm_mp_state *mp_state) |
1969 | { | 1962 | { |
1970 | vcpu_load(vcpu); | ||
1971 | mp_state->mp_state = vcpu->arch.mp_state; | 1963 | mp_state->mp_state = vcpu->arch.mp_state; |
1972 | vcpu_put(vcpu); | ||
1973 | return 0; | 1964 | return 0; |
1974 | } | 1965 | } |
1975 | 1966 | ||
@@ -2000,10 +1991,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu, | |||
2000 | { | 1991 | { |
2001 | int r = 0; | 1992 | int r = 0; |
2002 | 1993 | ||
2003 | vcpu_load(vcpu); | ||
2004 | vcpu->arch.mp_state = mp_state->mp_state; | 1994 | vcpu->arch.mp_state = mp_state->mp_state; |
2005 | if (vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED) | 1995 | if (vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED) |
2006 | r = vcpu_reset(vcpu); | 1996 | r = vcpu_reset(vcpu); |
2007 | vcpu_put(vcpu); | ||
2008 | return r; | 1997 | return r; |
2009 | } | 1998 | } |