x86, amd: Use _safe() msr access for GartTlbWlk disable code

[linux-flexiantxendom0-natty.git] / arch / x86 / kernel / cpu / amd.c

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index ae2be9a..e19776f 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -615,10 +615,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);
+               }
        }
 }