# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1229953720 0
# Node ID e2f36d066b7b66a538bbe240d46f49bede51d9ed
# Parent b59db1f95d193f3bd04401cc22965035e1bd8dbf
i386: Fix the build.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
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 -r b59db1f95d19 -r e2f36d066b7b xen/arch/x86/cpu/mcheck/mce_intel.c
--- a/xen/arch/x86/cpu/mcheck/mce_intel.c Mon Dec 22 13:43:13 2008 +0000
+++ b/xen/arch/x86/cpu/mcheck/mce_intel.c Mon Dec 22 13:48:40 2008 +0000
@@ -239,7 +239,7 @@ static int machine_check_poll(struct mc_
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 -r b59db1f95d19 -r e2f36d066b7b xen/arch/x86/cpu/mcheck/p5.c
--- a/xen/arch/x86/cpu/mcheck/p5.c Mon Dec 22 13:43:13 2008 +0000
+++ b/xen/arch/x86/cpu/mcheck/p5.c Mon Dec 22 13:48:40 2008 +0000
@@ -13,6 +13,7 @@
#include <asm/msr.h>
#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)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home