summary refs log tree commit diff
path: root/arch/ia64
diff options
context:
space:
mode:
authorIan Campbell <Ian.Campbell@eu.citrix.com>2011-03-01 20:05:49 +0000
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-03-01 18:10:54 -0500
commit44e69767cb7c3bc46e5370c39532c205d4347d80 (patch)
tree025e90c510878620bebc4ce1e393556512ea3f7c /arch/ia64
parentf5412be599602124d2bdd49947b231dd77c0bf99 (diff)
downloadlinux-44e69767cb7c3bc46e5370c39532c205d4347d80.tar.gz
xen: ia64 build broken due to "xen: switch to new schedop hypercall by default."
The git commit:

> commit a8b7458363b9174f3c2196ca6085630b4b30b7a1
> Author: Ian Campbell <ian.campbell@citrix.com>
> Date:   Thu Feb 17 11:04:20 2011 +0000
>
>     xen: switch to new schedop hypercall by default.
>
>     Rename old interface to sched_op_compat and rename sched_op_new to
>     simply sched_op.
>

breaks the IA64 build. This patch fixes it.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Ian Campbell <Ian.Campbell@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/xen/hypercall.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/xen/hypercall.h b/arch/ia64/include/asm/xen/hypercall.h
index 96fc62366aa4..ed28bcd5bb85 100644
--- a/arch/ia64/include/asm/xen/hypercall.h
+++ b/arch/ia64/include/asm/xen/hypercall.h
@@ -107,7 +107,7 @@ extern unsigned long __hypercall(unsigned long a1, unsigned long a2,
 static inline int
 xencomm_arch_hypercall_sched_op(int cmd, struct xencomm_handle *arg)
 {
-	return _hypercall2(int, sched_op_new, cmd, arg);
+	return _hypercall2(int, sched_op, cmd, arg);
 }
 
 static inline long