[Xen-ia64-devel] [PATCH 3/12]MCA handler support for Xen/ia64 TAKE 2

[SUZUKI Kazuhiro <kaz@xxxxxxxxxxxxxx>]

[3/12]  Fix GET_THIS_PADDR and define log queue struct.[mca-header.patch]

Signed-off-by: Yutaka Ezaki <yutaka.ezaki@xxxxxxxxxxxxxx>
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>

diff -r 3e4fa8b5b245 xen/include/asm-ia64/xenmca.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-ia64/xenmca.h     Fri Sep 22 09:28:04 2006 +0900
@@ -0,0 +1,34 @@
+/*
+ * File:       xenmca.h
+ * Purpose:    Machine check handling specific defines for Xen
+ *
+ * Copyright (C) 2006 FUJITSU LTD. (kaz@xxxxxxxxxxxxxx)
+ */
+
+#ifndef _ASM_IA64_XENMCA_H
+#define _ASM_IA64_XENMCA_H
+
+#ifndef        __ASSEMBLER__
+#include <linux/list.h>
+#include <asm/sal.h>
+
+typedef struct sal_queue_entry_t {
+       int cpuid;
+       int sal_info_type;
+       unsigned int vector;
+       unsigned int virq;
+       unsigned int length;
+       struct list_head list;
+} sal_queue_entry_t;
+
+extern struct list_head sal_queue[];
+
+struct ia64_mca_tlb_info {
+       u64 cr_lid;
+       u64 percpu_paddr;
+};
+
+extern struct ia64_mca_tlb_info ia64_mca_tlb_list[];
+#endif /* __ASSEMBLER__ */
+
+#endif /* _ASM_IA64_XENMCA_H */
diff -r 3e4fa8b5b245 xen/include/asm-ia64/linux-xen/asm/mca_asm.h
--- a/xen/include/asm-ia64/linux-xen/asm/mca_asm.h      Tue Sep 12 11:43:22 
2006 -0600
+++ b/xen/include/asm-ia64/linux-xen/asm/mca_asm.h      Fri Sep 22 09:26:49 
2006 +0900
@@ -59,8 +59,8 @@
 
 #ifdef XEN
 #define GET_THIS_PADDR(reg, var)               \
-       movl    reg = THIS_CPU(var)             \
-       tpa     reg = reg
+       mov     reg = IA64_KR(PER_CPU_DATA);;   \
+       addl    reg = THIS_CPU(var) - PERCPU_ADDR, reg
 #else
 #define GET_THIS_PADDR(reg, var)               \
        mov     reg = IA64_KR(PER_CPU_DATA);;   \

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel