[Xen-changelog] [linux-2.6.18-xen] x86-64: add missing change for 1199:c5d77641c738

[Xen patchbot-linux-2.6.18-xen <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1350639402 -7200
# Node ID bd485861bc4206d51400333919787d7f6a79aa3c
# Parent  c5d77641c7380dfe628491656d8a2001d08cd390
x86-64: add missing change for 1199:c5d77641c738

The change to include/asm-i386/mach-xen/asm/hypercall.h needs to be
mirrored to include/asm-x86_64/mach-xen/asm/hypercall.h.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r c5d77641c738 -r bd485861bc42 include/asm-x86_64/mach-xen/asm/hypercall.h
--- a/include/asm-x86_64/mach-xen/asm/hypercall.h       Wed Oct 17 10:58:39 
2012 +0200
+++ b/include/asm-x86_64/mach-xen/asm/hypercall.h       Fri Oct 19 11:36:42 
2012 +0200
@@ -37,7 +37,6 @@
 #ifndef __HYPERCALL_H__
 #define __HYPERCALL_H__
 
-#include <linux/string.h> /* memcpy() */
 #include <linux/stringify.h>
 #include <xen/interface/arch-x86/xen-mca.h>
 
@@ -135,6 +134,11 @@
        __res;                                                  \
 })
 
+#if CONFIG_XEN_COMPAT <= 0x030002
+int __must_check HYPERVISOR_event_channel_op_compat(int, void *);
+int __must_check HYPERVISOR_physdev_op_compat(int, void *);
+#endif
+
 static inline int __must_check
 HYPERVISOR_set_trap_table(
        const trap_info_t *table)
@@ -272,13 +276,8 @@ HYPERVISOR_event_channel_op(
        int rc = _hypercall2(int, event_channel_op, cmd, arg);
 
 #if CONFIG_XEN_COMPAT <= 0x030002
-       if (unlikely(rc == -ENOSYS)) {
-               struct evtchn_op op;
-               op.cmd = cmd;
-               memcpy(&op.u, arg, sizeof(op.u));
-               rc = _hypercall1(int, event_channel_op_compat, &op);
-               memcpy(arg, &op.u, sizeof(op.u));
-       }
+       if (unlikely(rc == -ENOSYS))
+               rc = HYPERVISOR_event_channel_op_compat(cmd, arg);
 #endif
 
        return rc;
@@ -305,13 +304,8 @@ HYPERVISOR_physdev_op(
        int rc = _hypercall2(int, physdev_op, cmd, arg);
 
 #if CONFIG_XEN_COMPAT <= 0x030002
-       if (unlikely(rc == -ENOSYS)) {
-               struct physdev_op op;
-               op.cmd = cmd;
-               memcpy(&op.u, arg, sizeof(op.u));
-               rc = _hypercall1(int, physdev_op_compat, &op);
-               memcpy(arg, &op.u, sizeof(op.u));
-       }
+       if (unlikely(rc == -ENOSYS))
+               rc = HYPERVISOR_physdev_op_compat(cmd, arg);
 #endif
 
        return rc;

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