From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Tue, 15 Nov 2011 13:50:18 +0000 (+0100)
Subject: KEXEC cleanup: IA64 specific functions should not live in generic header files
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=54b1268c59646a05079606ddd3782bbeaf0850bb;p=people%2Froyger%2Fxen.git

KEXEC cleanup: IA64 specific functions should not live in generic header files

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Committed-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/ia64/xen/crash.c b/xen/arch/ia64/xen/crash.c
index 1bdf36a5d1..e998442a5a 100644
--- a/xen/arch/ia64/xen/crash.c
+++ b/xen/arch/ia64/xen/crash.c
@@ -15,6 +15,7 @@
 #include <linux/hardirq.h>
 #include <linux/smp.h>
 #include <asm/processor.h>
+#include <asm/kexec.h>
 #include <xen/sched.h>
 
 void machine_crash_shutdown(void)
diff --git a/xen/include/asm-ia64/kexec.h b/xen/include/asm-ia64/kexec.h
index 97d892838f..2fc705757b 100644
--- a/xen/include/asm-ia64/kexec.h
+++ b/xen/include/asm-ia64/kexec.h
@@ -10,6 +10,7 @@ extern void relocate_new_kernel(unsigned long indirection_page,
                                 unsigned long boot_param,
                                 unsigned long dom0_relocate_new_kernel);
 void crash_save_xen_notes(void);
+void kexec_disable_iosapic(void);
 void machine_kexec(xen_kexec_image_t *image);
 unsigned long kdump_find_rsvd_region(unsigned long size,
                                      struct rsvd_region *rsvd_regions, int n);
diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h
index db58e62361..1039d0966b 100644
--- a/xen/include/xen/kexec.h
+++ b/xen/include/xen/kexec.h
@@ -31,7 +31,6 @@ void machine_kexec_reserved(xen_kexec_reserve_t *reservation);
 void machine_reboot_kexec(xen_kexec_image_t *image);
 void machine_kexec(xen_kexec_image_t *image);
 void kexec_crash(void);
-void kexec_disable_iosapic(void);
 void kexec_crash_save_cpu(void);
 crash_xen_info_t *kexec_crash_save_info(void);
 void machine_crash_shutdown(void);