[Xen-changelog] [linux-2.6.18-xen] [IA64] Kexec: Use xen machine_kexec() and machine_shutdown()

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1190922268 21600
# Node ID 95cf1f8dbd3b3f1535796d854055de22bee20769
# Parent  11646829a25fca9087c315776893759b919596e1
[IA64] Kexec: Use xen machine_kexec() and machine_shutdown()

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@xxxxxxxxxxxx>
---
 arch/ia64/kernel/machine_kexec.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r 11646829a25f -r 95cf1f8dbd3b arch/ia64/kernel/machine_kexec.c
--- a/arch/ia64/kernel/machine_kexec.c  Thu Sep 27 13:42:38 2007 -0600
+++ b/arch/ia64/kernel/machine_kexec.c  Thu Sep 27 13:44:28 2007 -0600
@@ -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 */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog