1 files changed, 6 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6f9d1f6063e9..8f5cabb3c5b0 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -629,10 +629,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
                  * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012
                  */
                 u64 mask;
+                int err;
 
-                rdmsrl(MSR_AMD64_MCx_MASK(4), mask);
-                mask |= (1 << 10);
-                wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+                err = rdmsrl_safe(MSR_AMD64_MCx_MASK(4), &mask);
+                if (err == 0) {
+                        mask |= (1 << 10);
+                        checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+                }
         }
 }