aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2009-10-25 11:45:07 -0400
committerAvi Kivity <avi@redhat.com>2009-12-03 02:32:22 -0500
commit1655e3a3dc16e21b60d9950e201b38a9894f1bcf (patch)
tree3fd97ca395740b811b29578daa735b72dd34b298 /arch/x86/kvm
parentc0a187e12d48235cb8af4cdeff283117ab42bbb2 (diff)
KVM: remove duplicated task_switch check
Probably introduced by a bad merge. Signed-off-by: Gleb Natapov <gleb@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm')
-rw-r--r--arch/x86/kvm/x86.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 58c5cddf363..dbddcc2d2c9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -4530,11 +4530,6 @@ int kvm_task_switch(struct kvm_vcpu *vcpu, u16 tss_selector, int reason)
4530 if (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE) 4530 if (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE)
4531 old_tss_sel = 0xffff; 4531 old_tss_sel = 0xffff;
4532 4532
4533 /* set back link to prev task only if NT bit is set in eflags
4534 note that old_tss_sel is not used afetr this point */
4535 if (reason != TASK_SWITCH_CALL && reason != TASK_SWITCH_GATE)
4536 old_tss_sel = 0xffff;
4537
4538 if (nseg_desc.type & 8) 4533 if (nseg_desc.type & 8)
4539 ret = kvm_task_switch_32(vcpu, tss_selector, old_tss_sel, 4534 ret = kvm_task_switch_32(vcpu, tss_selector, old_tss_sel,
4540 old_tss_base, &nseg_desc); 4535 old_tss_base, &nseg_desc);