]> xenbits.xensource.com Git - xen.git/commitdiff
kexec: fix ia64 build for 21300:8bdf09baff30
authorKUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Fri, 14 Jan 2011 08:14:00 +0000 (08:14 +0000)
committerKUWAMURA Shin'ya <kuwa@jp.fujitsu.com>
Fri, 14 Jan 2011 08:14:00 +0000 (08:14 +0000)
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>
xen/common/kexec.c

index 8b53d3aba8c0b1ed18239d54b317d224d5a11a7f..d2d5fde321beb3a3dc1abeb5cffcf49fc1e4b8cd 100644 (file)
@@ -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 */