[IA64] Kdump: pass control page to hypervisor

On ia64 the control page needs to be passed down to the hypervisor
on kexec.

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

diff --git a/arch/ia64/kernel/machine_kexec.c b/arch/ia64/kernel/machine_kexec.c
index a1caeebaabe84d4dcd53096f760b25152da6c532..665b438efce13fc87252b6d68d37caa4bae9f396 100644 (file)
--- a/arch/ia64/kernel/machine_kexec.c
+++ b/arch/ia64/kernel/machine_kexec.c
@@ -18,6 +18,10 @@
 #include <asm/setup.h>
 #include <asm/delay.h>
 #include <asm/meminit.h>
+#ifdef CONFIG_XEN
+#include <xen/interface/kexec.h>
+#include <asm/kexec.h>
+#endif
 
 typedef void (*relocate_new_kernel_t)(unsigned long, unsigned long,
                struct ia64_boot_param *, unsigned long);
@@ -132,4 +136,10 @@ void machine_kexec(struct kimage *image)
        unw_init_running(ia64_machine_kexec, image);
        for(;;);
 }
+#else /* CONFIG_XEN */
+void machine_kexec_setup_load_arg(xen_kexec_image_t *xki,struct kimage *image)
+{
+       xki->reboot_code_buffer =
+               kexec_page_to_pfn(image->control_code_page) << PAGE_SHIFT;
+}
 #endif /* CONFIG_XEN */

diff --git a/include/xen/interface/kexec.h b/include/xen/interface/kexec.h
index ca6e85b70169f55f5aac8d5c3342c07a853096ca..0f66ee0c37c8f300bfc16682ab83debb3f07edec 100644 (file)
--- a/include/xen/interface/kexec.h
+++ b/include/xen/interface/kexec.h
@@ -78,6 +78,9 @@
 typedef struct xen_kexec_image {
 #if defined(__i386__) || defined(__x86_64__)
     unsigned long page_list[KEXEC_XEN_NO_PAGES];
+#endif
+#if defined(__ia64__)
+    unsigned long reboot_code_buffer;
 #endif
     unsigned long indirection_page;
     unsigned long start_address;