# HG changeset patch
# User djm@kirby.fc.hp.com
# Date 1118771328 0
# Node ID 9947f23ecc7550f4fa68d0e3ca913df037c72ad8
# Parent  a514af3f60176b86efcaff82bbd5f526a952733c
bitkeeper revision 1.1709.1.6 (42af188067osLjX0T63Zb45JU4Zd2w)

Enable dom_mem_ops on XEN/IA64

Signed-off-by Kevin Tian <Kevin.tian@intel.com>


diff -r a514af3f6017 -r 9947f23ecc75 xen/arch/ia64/hypercall.c
--- a/xen/arch/ia64/hypercall.c	Tue Jun 14 17:39:23 2005 +0000
+++ b/xen/arch/ia64/hypercall.c	Tue Jun 14 17:48:48 2005 +0000
@@ -126,8 +126,7 @@ ia64_hypercall (struct pt_regs *regs)
 		break;
 
 	    case __HYPERVISOR_dom_mem_op:
-		/* regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); */
-		/* we don't handle reservations; just return success */
+		regs->r8 = do_dom_mem_op(regs->r14, regs->r15, regs->r16, regs->r17, regs->r18); 
 		regs->r8 = regs->r16;
 		break;
 
diff -r a514af3f6017 -r 9947f23ecc75 xen/common/Makefile
--- a/xen/common/Makefile	Tue Jun 14 17:39:23 2005 +0000
+++ b/xen/common/Makefile	Tue Jun 14 17:48:48 2005 +0000
@@ -1,8 +1,8 @@
 
 include $(BASEDIR)/Rules.mk
 
-ifeq ($(TARGET_ARCH),ia64) 
-OBJS := $(subst dom_mem_ops.o,,$(OBJS))
+ifeq ($(TARGET_ARCH),ia64)
+#OBJS := $(subst dom_mem_ops.o,,$(OBJS))
 OBJS := $(subst grant_table.o,,$(OBJS))
 endif