From de5544e7032a4800ebee10b20c45cc63c13da03e Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Wed, 4 Mar 2009 21:05:35 +0900
Subject: [PATCH] --- yaml --- r: 139587 b: refs/heads/master c:
 533bd156231eec4b399c36579e7c30b6f52cfd29 h: refs/heads/master i:   139585:
 7d2ef4c6bd61f7b29d1176a47a5c6d2b9759fb7a   139583:
 b359999ed69c5ab5e93d12f246716fdb439dfa18 v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/ia64/include/asm/xen/inst.h |  3 +++
 trunk/arch/ia64/xen/Makefile           |  2 +-
 trunk/arch/ia64/xen/xen_pv_ops.c       | 14 ++++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2e2629f44dbb..a56a9b94533b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd97d5cb540939602cba9af6f88e883a6fe451f0
+refs/heads/master: 533bd156231eec4b399c36579e7c30b6f52cfd29
diff --git a/trunk/arch/ia64/include/asm/xen/inst.h b/trunk/arch/ia64/include/asm/xen/inst.h
index 19c2ae1d878a..e8e01b28d2ae 100644
--- a/trunk/arch/ia64/include/asm/xen/inst.h
+++ b/trunk/arch/ia64/include/asm/xen/inst.h
@@ -33,6 +33,9 @@
 #define __paravirt_work_processed_syscall_target \
 						xen_work_processed_syscall
 
+#define paravirt_fsyscall_table			xen_fsyscall_table
+#define paravirt_fsys_bubble_down		xen_fsys_bubble_down
+
 #define MOV_FROM_IFA(reg)	\
 	movl reg = XSI_IFA;	\
 	;;			\
diff --git a/trunk/arch/ia64/xen/Makefile b/trunk/arch/ia64/xen/Makefile
index 0ad0224693d9..b4ca2e6c0ead 100644
--- a/trunk/arch/ia64/xen/Makefile
+++ b/trunk/arch/ia64/xen/Makefile
@@ -10,7 +10,7 @@ obj-$(CONFIG_IA64_GENERIC) += machvec.o
 AFLAGS_xenivt.o += -D__IA64_ASM_PARAVIRTUALIZED_XEN
 
 # xen multi compile
-ASM_PARAVIRT_MULTI_COMPILE_SRCS = ivt.S entry.S
+ASM_PARAVIRT_MULTI_COMPILE_SRCS = ivt.S entry.S fsys.S
 ASM_PARAVIRT_OBJS = $(addprefix xen-,$(ASM_PARAVIRT_MULTI_COMPILE_SRCS:.S=.o))
 obj-y += $(ASM_PARAVIRT_OBJS)
 define paravirtualized_xen
diff --git a/trunk/arch/ia64/xen/xen_pv_ops.c b/trunk/arch/ia64/xen/xen_pv_ops.c
index fa3b967e69cb..fe72308321b6 100644
--- a/trunk/arch/ia64/xen/xen_pv_ops.c
+++ b/trunk/arch/ia64/xen/xen_pv_ops.c
@@ -24,6 +24,7 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/pm.h>
+#include <linux/unistd.h>
 
 #include <asm/xen/hypervisor.h>
 #include <asm/xen/xencomm.h>
@@ -165,6 +166,18 @@ static const struct pv_init_ops xen_init_ops __initconst = {
 	.post_smp_prepare_boot_cpu = xen_post_smp_prepare_boot_cpu,
 };
 
+/***************************************************************************
+ * pv_fsys_data
+ * addresses for fsys
+ */
+
+extern unsigned long xen_fsyscall_table[NR_syscalls];
+extern char xen_fsys_bubble_down[];
+struct pv_fsys_data xen_fsys_data __initdata = {
+	.fsyscall_table = (unsigned long *)xen_fsyscall_table,
+	.fsys_bubble_down = (void *)xen_fsys_bubble_down,
+};
+
 /***************************************************************************
  * pv_cpu_ops
  * intrinsics hooks.
@@ -355,6 +368,7 @@ xen_setup_pv_ops(void)
 	xen_info_init();
 	pv_info = xen_info;
 	pv_init_ops = xen_init_ops;
+	pv_fsys_data = xen_fsys_data;
 	pv_cpu_ops = xen_cpu_ops;
 	pv_iosapic_ops = xen_iosapic_ops;
 	pv_irq_ops = xen_irq_ops;