diff options
| author | Keir Fraser <keir@xen.org> | 2012-03-07 09:04:11 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2012-03-07 09:04:11 +0000 |
| commit | 95c72af99bd952de17f9bd231f9918d669a5ab93 (patch) | |
| tree | d365cca199b3825c07cdb026bd83215cb1cc403d | |
| parent | 285263304c2ef31b41eacbd29a8ad97f41fe7783 (diff) | |
| download | xen-95c72af99bd952de17f9bd231f9918d669a5ab93.tar.gz xen-95c72af99bd952de17f9bd231f9918d669a5ab93.tar.bz2 xen-95c72af99bd952de17f9bd231f9918d669a5ab93.zip | |
Fix build after previous changeset.
Signed-off-by: Keir Fraser <keir@xen.org>
| -rw-r--r-- | xen/arch/x86/cpu/mcheck/mce_amd_quirks.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c b/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c index 7da525c10f..2015cd1afa 100644 --- a/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c +++ b/xen/arch/x86/cpu/mcheck/mce_amd_quirks.c @@ -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; } |