x86/cpu/amd, kvm: Satisfy guest kernel reads of IC_CFG MSR

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index a8816b3251620c941f543e595e949aa60c43467d..e229640c19ab9480e92134e212dadffee11307d4 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -678,9 +678,9 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
         * Disable it on the affected CPUs.
         */
        if ((c->x86_model >= 0x02) && (c->x86_model < 0x20)) {
-               if (!rdmsrl_safe(0xc0011021, &value) && !(value & 0x1E)) {
+               if (!rdmsrl_safe(MSR_F15H_IC_CFG, &value) && !(value & 0x1E)) {
                        value |= 0x1E;
-                       wrmsrl_safe(0xc0011021, value);
+                       wrmsrl_safe(MSR_F15H_IC_CFG, value);
                }
        }
 }