[Xen-changelog] [xen-unstable] [IA64] MCA support - Fix GET_THIS_PADDR and define log queue struct

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID efb346a02e704797e780dcaff9ea163059f10677
# Parent  2afdc0066df69cf8f1fb4eb1881ae2e9b1c63164
[IA64] MCA support - Fix GET_THIS_PADDR and define log queue struct

Signed-off-by: Yutaka Ezaki <yutaka.ezaki@xxxxxxxxxxxxxx>
Signed-off-by: Masaki Kanno <kanno.masaki@xxxxxxxxxxxxxx>
Signed-off-by: Kazuhiro Suzuki <kaz@xxxxxxxxxxxxxx>
---
 xen/include/asm-ia64/linux-xen/asm/mca_asm.h |    4 +--
 xen/include/asm-ia64/xenmca.h                |   34 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff -r 2afdc0066df6 -r efb346a02e70 
xen/include/asm-ia64/linux-xen/asm/mca_asm.h
--- a/xen/include/asm-ia64/linux-xen/asm/mca_asm.h      Sun Oct 29 09:27:11 
2006 -0700
+++ b/xen/include/asm-ia64/linux-xen/asm/mca_asm.h      Sun Oct 29 09:27:12 
2006 -0700
@@ -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);;   \
diff -r 2afdc0066df6 -r efb346a02e70 xen/include/asm-ia64/xenmca.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-ia64/xenmca.h     Sun Oct 29 09:27:12 2006 -0700
@@ -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 */

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