Subject: [IA64] Kexec: Use xen machine_kexec() and machine_shutdown()
From: Simon Horman <horms@verge.net.au>
Date: Fri, 13 Jul 2007 15:11:01 +0900

machine_kexec() and machine_shutdown() are defined by xen code
rather than ia64 code when xen is in use

Signed-off-by: Simon Horman <horms@verge.net.au>

Index: linux-2.6.18-xen.hg/arch/ia64/kernel/machine_kexec.c
===================================================================
--- linux-2.6.18-xen.hg.orig/arch/ia64/kernel/machine_kexec.c	2007-07-10 11:23:33.000000000 +0900
+++ linux-2.6.18-xen.hg/arch/ia64/kernel/machine_kexec.c	2007-07-10 11:24:38.000000000 +0900
@@ -65,6 +65,7 @@ void machine_kexec_cleanup(struct kimage
 {
 }
 
+#ifndef CONFIG_XEN
 void machine_shutdown(void)
 {
 	int cpu;
@@ -131,3 +132,4 @@ void machine_kexec(struct kimage *image)
 	unw_init_running(ia64_machine_kexec, image);
 	for(;;);
 }
+#endif /* CONFIG_XEN */