diff options
Diffstat (limited to 'arch/x86/kvm/svm.c')
-rw-r--r-- | arch/x86/kvm/svm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 56c9b6bd7655..bc5b9b8d4a33 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c | |||
@@ -131,7 +131,7 @@ static struct svm_direct_access_msrs { | |||
131 | u32 index; /* Index of the MSR */ | 131 | u32 index; /* Index of the MSR */ |
132 | bool always; /* True if intercept is always on */ | 132 | bool always; /* True if intercept is always on */ |
133 | } direct_access_msrs[] = { | 133 | } direct_access_msrs[] = { |
134 | { .index = MSR_K6_STAR, .always = true }, | 134 | { .index = MSR_STAR, .always = true }, |
135 | { .index = MSR_IA32_SYSENTER_CS, .always = true }, | 135 | { .index = MSR_IA32_SYSENTER_CS, .always = true }, |
136 | #ifdef CONFIG_X86_64 | 136 | #ifdef CONFIG_X86_64 |
137 | { .index = MSR_GS_BASE, .always = true }, | 137 | { .index = MSR_GS_BASE, .always = true }, |
@@ -384,8 +384,7 @@ static void svm_init_erratum_383(void) | |||
384 | int err; | 384 | int err; |
385 | u64 val; | 385 | u64 val; |
386 | 386 | ||
387 | /* Only Fam10h is affected */ | 387 | if (!cpu_has_amd_erratum(amd_erratum_383)) |
388 | if (boot_cpu_data.x86 != 0x10) | ||
389 | return; | 388 | return; |
390 | 389 | ||
391 | /* Use _safe variants to not break nested virtualization */ | 390 | /* Use _safe variants to not break nested virtualization */ |
@@ -2433,7 +2432,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data) | |||
2433 | *data = tsc_offset + native_read_tsc(); | 2432 | *data = tsc_offset + native_read_tsc(); |
2434 | break; | 2433 | break; |
2435 | } | 2434 | } |
2436 | case MSR_K6_STAR: | 2435 | case MSR_STAR: |
2437 | *data = svm->vmcb->save.star; | 2436 | *data = svm->vmcb->save.star; |
2438 | break; | 2437 | break; |
2439 | #ifdef CONFIG_X86_64 | 2438 | #ifdef CONFIG_X86_64 |
@@ -2557,7 +2556,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) | |||
2557 | 2556 | ||
2558 | break; | 2557 | break; |
2559 | } | 2558 | } |
2560 | case MSR_K6_STAR: | 2559 | case MSR_STAR: |
2561 | svm->vmcb->save.star = data; | 2560 | svm->vmcb->save.star = data; |
2562 | break; | 2561 | break; |
2563 | #ifdef CONFIG_X86_64 | 2562 | #ifdef CONFIG_X86_64 |