Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / arch / x86 / kvm / svm.c

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 5c81daf3ef5782ffdd3337ff4536f046ac7fd094..bc5b9b8d4a33117259882835bfb884f4f8f37656 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -131,7 +131,7 @@ static struct svm_direct_access_msrs {
        u32 index;   /* Index of the MSR */
        bool always; /* True if intercept is always on */
 } direct_access_msrs[] = {
-       { .index = MSR_K6_STAR,                         .always = true  },
+       { .index = MSR_STAR,                            .always = true  },
        { .index = MSR_IA32_SYSENTER_CS,                .always = true  },
 #ifdef CONFIG_X86_64
        { .index = MSR_GS_BASE,                         .always = true  },
@@ -2432,7 +2432,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
                *data = tsc_offset + native_read_tsc();
                break;
        }
-       case MSR_K6_STAR:
+       case MSR_STAR:
                *data = svm->vmcb->save.star;
                break;
 #ifdef CONFIG_X86_64
@@ -2556,7 +2556,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
 
                break;
        }
-       case MSR_K6_STAR:
+       case MSR_STAR:
                svm->vmcb->save.star = data;
                break;
 #ifdef CONFIG_X86_64