1.1 --- a/xen/include/asm-ia64/linux-xen/asm/mca_asm.h	Sun Oct 29 09:27:11 2006 -0700
     1.2 +++ b/xen/include/asm-ia64/linux-xen/asm/mca_asm.h	Sun Oct 29 09:27:12 2006 -0700
     1.3 @@ -59,8 +59,8 @@
     1.4  
     1.5  #ifdef XEN
     1.6  #define GET_THIS_PADDR(reg, var)		\
     1.7 -	movl	reg = THIS_CPU(var)		\
     1.8 -	tpa	reg = reg
     1.9 +	mov	reg = IA64_KR(PER_CPU_DATA);;	\
    1.10 +	addl	reg = THIS_CPU(var) - PERCPU_ADDR, reg
    1.11  #else
    1.12  #define GET_THIS_PADDR(reg, var)		\
    1.13  	mov	reg = IA64_KR(PER_CPU_DATA);;	\

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/include/asm-ia64/xenmca.h	Sun Oct 29 09:27:12 2006 -0700
     2.3 @@ -0,0 +1,34 @@
     2.4 +/*
     2.5 + * File:	xenmca.h
     2.6 + * Purpose:	Machine check handling specific defines for Xen
     2.7 + *
     2.8 + * Copyright (C) 2006 FUJITSU LTD. (kaz@jp.fujitsu.com)
     2.9 + */
    2.10 +
    2.11 +#ifndef _ASM_IA64_XENMCA_H
    2.12 +#define _ASM_IA64_XENMCA_H
    2.13 +
    2.14 +#ifndef __ASSEMBLER__
    2.15 +#include <linux/list.h>
    2.16 +#include <asm/sal.h>
    2.17 +
    2.18 +typedef struct sal_queue_entry_t {
    2.19 +	int cpuid;
    2.20 +	int sal_info_type;
    2.21 +	unsigned int vector;
    2.22 +	unsigned int virq;
    2.23 +	unsigned int length;
    2.24 +	struct list_head list;
    2.25 +} sal_queue_entry_t;
    2.26 +
    2.27 +extern struct list_head sal_queue[];
    2.28 +
    2.29 +struct ia64_mca_tlb_info {
    2.30 +	u64 cr_lid;
    2.31 +	u64 percpu_paddr;
    2.32 +};
    2.33 +
    2.34 +extern struct ia64_mca_tlb_info ia64_mca_tlb_list[];
    2.35 +#endif	/* __ASSEMBLER__ */
    2.36 +
    2.37 +#endif /* _ASM_IA64_XENMCA_H */