Alex Williamson
2007-Oct-12 17:11 UTC
[Xen-devel] Re: [Xen-staging] [linux-2.6.18-xen] Sync Xen public headers.
On Fri, 2007-10-12 at 12:08 +0100, Xen staging patchbot-linux-2.6.18-xen wrote:> # HG changeset patch > # User Keir Fraser > # Date 1192187252 -3600 > # Node ID d081f7efcb60adf5a82b943f9cc524cfa254e413 > # Parent 7334d4ad4b526e5124d31c448586fa4da9d186f9 > Sync Xen public headers.Hi Keir, This exposed some breakage on ia64. We still have some references to acm_op. Patch below. Thanks, Alex [IA64] Use xsm_op instead of acm_op Signed-off-by: Alex Williamson <alex.williamson@hp.com> --- diff -r d34182a37ba9 arch/ia64/xen/xcom_privcmd.c --- a/arch/ia64/xen/xcom_privcmd.c Fri Oct 12 12:08:17 2007 +0100 +++ b/arch/ia64/xen/xcom_privcmd.c Fri Oct 12 11:04:06 2007 -0600 @@ -334,7 +334,7 @@ xencomm_privcmd_domctl(privcmd_hypercall } static int -xencomm_privcmd_acm_op(privcmd_hypercall_t *hypercall) +xencomm_privcmd_xsm_op(privcmd_hypercall_t *hypercall) { void __user *arg = (void __user *)hypercall->arg[0]; xen_acmctl_t kern_arg; @@ -360,7 +360,7 @@ xencomm_privcmd_acm_op(privcmd_hypercall set_xen_guest_handle(kern_arg.u.getssid.ssidbuf, (void *)desc); - ret = xencomm_arch_hypercall_acm_op(op_desc); + ret = xencomm_arch_hypercall_xsm_op(op_desc); xencomm_free(desc); @@ -783,8 +783,8 @@ privcmd_hypercall(privcmd_hypercall_t *h return xencomm_privcmd_domctl(hypercall); case __HYPERVISOR_sysctl: return xencomm_privcmd_sysctl(hypercall); - case __HYPERVISOR_acm_op: - return xencomm_privcmd_acm_op(hypercall); + case __HYPERVISOR_xsm_op: + return xencomm_privcmd_xsm_op(hypercall); case __HYPERVISOR_xen_version: return xencomm_privcmd_xen_version(hypercall); case __HYPERVISOR_memory_op: diff -r d34182a37ba9 include/asm-ia64/hypercall.h --- a/include/asm-ia64/hypercall.h Fri Oct 12 12:08:17 2007 +0100 +++ b/include/asm-ia64/hypercall.h Fri Oct 12 10:36:58 2007 -0600 @@ -157,9 +157,9 @@ xencomm_arch_hypercall_event_channel_op( } static inline int -xencomm_arch_hypercall_acm_op(struct xencomm_handle *arg) -{ - return _hypercall1(int, acm_op, arg); +xencomm_arch_hypercall_xsm_op(struct xencomm_handle *arg) +{ + return _hypercall1(int, xsm_op, arg); } static inline int _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel