From f99dc195cc5abd4aea3edf0c482e59ebd2ae8bbf Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 22 Dec 2008 13:48:40 +0000 Subject: [PATCH] i386: Fix the build. Signed-off-by: Keir Fraser --- xen/arch/x86/cpu/mcheck/mce_intel.c | 6 +++--- xen/arch/x86/cpu/mcheck/p5.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce_intel.c b/xen/arch/x86/cpu/mcheck/mce_intel.c index b951fb9fbd..e5ce422617 100644 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c @@ -239,7 +239,7 @@ static int machine_check_poll(struct mc_info *mi, int calltype) add_taint(TAINT_MACHINE_CHECK); /*Clear state for this bank */ wrmsrl(MSR_IA32_MC0_STATUS + 4 * i, 0); - printk(KERN_DEBUG "mcheck_poll: bank%i CPU%d status[%lx]\n", + printk(KERN_DEBUG "mcheck_poll: bank%i CPU%d status[%"PRIx64"]\n", i, cpu, status); printk(KERN_DEBUG "mcheck_poll: CPU%d, SOCKET%d, CORE%d, APICID[%d], " "thread[%d]\n", cpu, mcg.mc_socketid, @@ -609,8 +609,8 @@ static void mce_intel_work_fn(void *data) on_each_cpu(mce_intel_checkregs, data, 1, 1); if (adjust) { period = period / (adjust + 1); - printk(KERN_DEBUG "mcheck_poll: Find error, shorten interval to %ld", - period); + printk(KERN_DEBUG "mcheck_poll: Find error, shorten interval " + "to %"PRIu64"\n", period); } else { period *= 2; diff --git a/xen/arch/x86/cpu/mcheck/p5.c b/xen/arch/x86/cpu/mcheck/p5.c index ac952af082..97360bc7e7 100644 --- a/xen/arch/x86/cpu/mcheck/p5.c +++ b/xen/arch/x86/cpu/mcheck/p5.c @@ -13,6 +13,7 @@ #include #include "mce.h" +#include "x86_mca.h" /* Machine check handler for Pentium class Intel */ static fastcall void pentium_machine_check(struct cpu_user_regs * regs, long error_code) -- 2.30.2