ia64/xen-unstable

changeset 18951:e2f36d066b7b

i386: Fix the build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Dec 22 13:48:40 2008 +0000 (2008-12-22)
parents b59db1f95d19
children 07f26e047fbf c54d6f871de8
files xen/arch/x86/cpu/mcheck/mce_intel.c xen/arch/x86/cpu/mcheck/p5.c
line diff
     1.1 --- a/xen/arch/x86/cpu/mcheck/mce_intel.c	Mon Dec 22 13:43:13 2008 +0000
     1.2 +++ b/xen/arch/x86/cpu/mcheck/mce_intel.c	Mon Dec 22 13:48:40 2008 +0000
     1.3 @@ -239,7 +239,7 @@ static int machine_check_poll(struct mc_
     1.4          add_taint(TAINT_MACHINE_CHECK);
     1.5          /*Clear state for this bank */
     1.6          wrmsrl(MSR_IA32_MC0_STATUS + 4 * i, 0);
     1.7 -        printk(KERN_DEBUG "mcheck_poll: bank%i CPU%d status[%lx]\n", 
     1.8 +        printk(KERN_DEBUG "mcheck_poll: bank%i CPU%d status[%"PRIx64"]\n", 
     1.9                  i, cpu, status);
    1.10          printk(KERN_DEBUG "mcheck_poll: CPU%d, SOCKET%d, CORE%d, APICID[%d], "
    1.11                  "thread[%d]\n", cpu, mcg.mc_socketid, 
    1.12 @@ -609,8 +609,8 @@ static void mce_intel_work_fn(void *data
    1.13      on_each_cpu(mce_intel_checkregs, data, 1, 1);
    1.14      if (adjust) {
    1.15          period = period / (adjust + 1);
    1.16 -        printk(KERN_DEBUG "mcheck_poll: Find error, shorten interval to %ld",
    1.17 -            period);
    1.18 +        printk(KERN_DEBUG "mcheck_poll: Find error, shorten interval "
    1.19 +               "to %"PRIu64"\n", period);
    1.20      }
    1.21      else {
    1.22          period *= 2;
     2.1 --- a/xen/arch/x86/cpu/mcheck/p5.c	Mon Dec 22 13:43:13 2008 +0000
     2.2 +++ b/xen/arch/x86/cpu/mcheck/p5.c	Mon Dec 22 13:48:40 2008 +0000
     2.3 @@ -13,6 +13,7 @@
     2.4  #include <asm/msr.h>
     2.5  
     2.6  #include "mce.h"
     2.7 +#include "x86_mca.h"
     2.8  
     2.9  /* Machine check handler for Pentium class Intel */
    2.10  static fastcall void pentium_machine_check(struct cpu_user_regs * regs, long error_code)