aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKUWAMURA Shin'ya <kuwa@jp.fujitsu.com>2011-01-14 08:14:00 +0000
committerKUWAMURA Shin'ya <kuwa@jp.fujitsu.com>2011-01-14 08:14:00 +0000
commit9d49dd444f1f501c248e0e08fe7126842f869624 (patch)
treecade576e845fa2b15a72838dbc82fe1fc9936889
parentebafe597e9395f5a06d8209d4c21dbe4bf05ccb6 (diff)
downloadxen-9d49dd444f1f501c248e0e08fe7126842f869624.tar.gz
xen-9d49dd444f1f501c248e0e08fe7126842f869624.tar.bz2
xen-9d49dd444f1f501c248e0e08fe7126842f869624.zip
kexec: fix ia64 build for 21300:8bdf09baff30
On ia64, 21300:8bdf09baff30 introduces the following error: xen/common/kexec.c:490: undefined reference to `continue_hypercall_on_cpu' The function continue_hypercall_on_cpu() is defined only on x86. Signed-off-by: KUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
-rw-r--r--xen/common/kexec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xen/common/kexec.c b/xen/common/kexec.c
index 8b53d3aba8..d2d5fde321 100644
--- a/xen/common/kexec.c
+++ b/xen/common/kexec.c
@@ -487,7 +487,12 @@ static int kexec_exec(XEN_GUEST_HANDLE(void) uarg)
{
case KEXEC_TYPE_DEFAULT:
image = &kexec_image[base + pos];
+#ifdef CONFIG_X86
ret = continue_hypercall_on_cpu(0, kexec_reboot, image);
+#else
+ one_cpu_only();
+ machine_reboot_kexec(image); /* Does not return */
+#endif
break;
case KEXEC_TYPE_CRASH:
kexec_crash(); /* Does not return */