]> xenbits.xensource.com Git - xen.git/commitdiff
Fix build after previous changeset.
authorKeir Fraser <keir@xen.org>
Wed, 7 Mar 2012 09:04:11 +0000 (09:04 +0000)
committerKeir Fraser <keir@xen.org>
Wed, 7 Mar 2012 09:04:11 +0000 (09:04 +0000)
Signed-off-by: Keir Fraser <keir@xen.org>
xen/arch/x86/cpu/mcheck/mce_amd_quirks.c

index 7da525c10fcea86b42a63b40814863a382c5039b..2015cd1afa36581619585457765ed93e41b32015 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <asm-x86/msr.h>
 #include <asm-x86/processor.h>
+#include <xen/errno.h>
 
 #include "mce_quirks.h"
 
@@ -56,7 +57,7 @@ mcequirk_lookup_amd_quirkdata(struct cpuinfo_x86 *c)
 
 int mcequirk_amd_apply(enum mcequirk_amd_flags flags)
 {
-       u64 val;
+    u32 lo, hi;
 
        switch (flags) {
        case MCEQUIRK_K7_BANK0:
@@ -72,8 +73,8 @@ int mcequirk_amd_apply(enum mcequirk_amd_flags flags)
                wrmsrl(MSR_IA32_MC4_STATUS, 0ULL);
                break;
        case MCEQUIRK_F10_GART:
-               if (rdmsr_safe(MSR_AMD64_MCx_MASK(4), val) == 0)
-                       wrmsr_safe(MSR_AMD64_MCx_MASK(4), val | (1 << 10));
+            if (rdmsr_safe(MSR_AMD64_MCx_MASK(4), lo, hi) == 0)
+                    wrmsr_safe(MSR_AMD64_MCx_MASK(4), lo | (1 << 10), hi);
                break;
        }