aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Cooper <andrew.cooper3@citrix.com>2011-11-15 14:50:18 +0100
committerAndrew Cooper <andrew.cooper3@citrix.com>2011-11-15 14:50:18 +0100
commit54b1268c59646a05079606ddd3782bbeaf0850bb (patch)
tree2430efd0c59a7efefb61fbe1693169888a12d832
parent525848a54bd7c76fa59836231368465380909463 (diff)
downloadxen-54b1268c59646a05079606ddd3782bbeaf0850bb.tar.gz
xen-54b1268c59646a05079606ddd3782bbeaf0850bb.tar.bz2
xen-54b1268c59646a05079606ddd3782bbeaf0850bb.zip
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>
-rw-r--r--xen/arch/ia64/xen/crash.c1
-rw-r--r--xen/include/asm-ia64/kexec.h1
-rw-r--r--xen/include/xen/kexec.h1
3 files changed, 2 insertions, 1 deletions
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);