[Xen-changelog] [xen-4.0-testing] Fix build after previous changeset.

[Xen patchbot-4.0-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1331111051 0
# Node ID 35ee60fe531f5a8e10b5ad314dfa287a3c09265d
# Parent  cf5751788c49ee25db5c9280d6dc9ea3e6b8f97a
Fix build after previous changeset.

Signed-off-by: Keir Fraser <keir@xxxxxxx>
---


diff -r cf5751788c49 -r 35ee60fe531f xen/arch/x86/cpu/mcheck/mce_amd_quirks.c
--- a/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c  Wed Mar 07 08:56:28 2012 +0000
+++ b/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c  Wed Mar 07 09:04:11 2012 +0000
@@ -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 @@
 
 int mcequirk_amd_apply(enum mcequirk_amd_flags flags)
 {
-       u64 val;
+    u32 lo, hi;
 
        switch (flags) {
        case MCEQUIRK_K7_BANK0:
@@ -72,8 +73,8 @@
                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;
        }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog