# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1170932609 0
# Node ID b50350fb0fde6bbd1e8ad3c41ed0ba686713ae7c
# Parent 3fbe12560ffe84359e2bc7bce12b0cc34a1e398c
[XEN] kexec: Remove asm/kexec.h. Move the single inline function into
arch specific machine_kexec.c with the other arch specific kexec
functions.
IA64 already had a stub in both kexec.h and machine_kexec.c.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
xen/include/asm-ia64/kexec.h | 25 -----------------------
xen/include/asm-powerpc/kexec.h | 25 -----------------------
xen/include/asm-x86/kexec.h | 20 ------------------
xen/include/asm-x86/x86_32/kexec.h | 39 -------------------------------------
xen/include/asm-x86/x86_64/kexec.h | 38 ------------------------------------
xen/arch/powerpc/machine_kexec.c | 5 ++++
xen/arch/x86/crash.c | 1
xen/arch/x86/machine_kexec.c | 15 +++++++++++++-
xen/common/kexec.c | 1
xen/include/xen/kexec.h | 1
10 files changed, 20 insertions(+), 150 deletions(-)
diff -r 3fbe12560ffe -r b50350fb0fde xen/arch/powerpc/machine_kexec.c
--- a/xen/arch/powerpc/machine_kexec.c Thu Feb 08 10:44:53 2007 +0000
+++ b/xen/arch/powerpc/machine_kexec.c Thu Feb 08 11:03:29 2007 +0000
@@ -19,6 +19,11 @@ void machine_reboot_kexec(xen_kexec_imag
printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
}
+void machine_kexec(xen_kexec_image_t *image)
+{
+ printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
+}
+
/*
* Local variables:
* mode: C
diff -r 3fbe12560ffe -r b50350fb0fde xen/arch/x86/crash.c
--- a/xen/arch/x86/crash.c Thu Feb 08 10:44:53 2007 +0000
+++ b/xen/arch/x86/crash.c Thu Feb 08 11:03:29 2007 +0000
@@ -11,7 +11,6 @@
#include <asm/atomic.h>
#include <asm/elf.h>
#include <asm/percpu.h>
-#include <asm/kexec.h>
#include <xen/types.h>
#include <xen/irq.h>
#include <asm/ipi.h>
diff -r 3fbe12560ffe -r b50350fb0fde xen/arch/x86/machine_kexec.c
--- a/xen/arch/x86/machine_kexec.c Thu Feb 08 10:44:53 2007 +0000
+++ b/xen/arch/x86/machine_kexec.c Thu Feb 08 11:03:29 2007 +0000
@@ -15,10 +15,14 @@
#include <xen/types.h>
#include <xen/console.h>
#include <xen/kexec.h>
-#include <asm/kexec.h>
#include <xen/domain_page.h>
#include <asm/fixmap.h>
#include <asm/hvm/hvm.h>
+
+typedef void (*relocate_new_kernel_t)(
+ unsigned long indirection_page,
+ unsigned long page_list,
+ unsigned long start_address);
int machine_kexec_load(int type, int slot, xen_kexec_image_t *image)
{
@@ -94,6 +98,15 @@ void machine_reboot_kexec(xen_kexec_imag
BUG();
}
+void machine_kexec(xen_kexec_image_t *image)
+{
+ relocate_new_kernel_t rnk;
+
+ rnk = (relocate_new_kernel_t) image->page_list[1];
+ (*rnk)(image->indirection_page, (unsigned long)image->page_list,
+ image->start_address);
+}
+
/*
* Local variables:
* mode: C
diff -r 3fbe12560ffe -r b50350fb0fde xen/common/kexec.c
--- a/xen/common/kexec.c Thu Feb 08 10:44:53 2007 +0000
+++ b/xen/common/kexec.c Thu Feb 08 11:03:29 2007 +0000
@@ -6,7 +6,6 @@
* - Magnus Damm <magnus@xxxxxxxxxxxxx>
*/
-#include <asm/kexec.h>
#include <xen/lib.h>
#include <xen/ctype.h>
#include <xen/errno.h>
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/asm-ia64/kexec.h
--- a/xen/include/asm-ia64/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#ifndef __IA64_KEXEC_H__
-#define __IA64_KEXEC_H__
-
-#include <xen/lib.h> /* for printk() used in stub */
-#include <xen/types.h>
-#include <public/xen.h>
-#include <xen/kexec.h>
-
-static inline void machine_kexec(xen_kexec_image_t *image)
-{
- printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
-}
-
-#endif /* __IA64_KEXEC_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
-
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/asm-powerpc/kexec.h
--- a/xen/include/asm-powerpc/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#ifndef _ASM_KEXEC_H__
-#define _ASM_KEXEC_H__
-
-#include <xen/lib.h> /* for printk() used in stub */
-#include <xen/types.h>
-#include <public/xen.h>
-#include <xen/kexec.h>
-
-static inline void machine_kexec(xen_kexec_image_t *image)
-{
- printk("STUB: " __FILE__ ": %s: not implemented\n", __FUNCTION__);
-}
-
-#endif /* _ASM_KEXEC_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
-
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/asm-x86/kexec.h
--- a/xen/include/asm-x86/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-#ifndef __X86_KEXEC_H__
-#define __X86_KEXEC_H__
-
-#ifdef __x86_64__
-#include <asm/x86_64/kexec.h>
-#else
-#include <asm/x86_32/kexec.h>
-#endif
-
-#endif /* __X86_KEXEC_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/asm-x86/x86_32/kexec.h
--- a/xen/include/asm-x86/x86_32/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/******************************************************************************
- * kexec.h
- *
- * Based heavily on machine_kexec.c and kexec.h from Linux 2.6.19-rc1
- *
- */
-
-#ifndef __X86_KEXEC_X86_32_H__
-#define __X86_KEXEC_X86_32_H__
-
-#include <xen/types.h>
-#include <xen/kexec.h>
-
-typedef asmlinkage void (*relocate_new_kernel_t)(
- unsigned long indirection_page,
- unsigned long page_list,
- unsigned long start_address,
- unsigned int has_pae);
-
-static inline void machine_kexec(xen_kexec_image_t *image)
-{
- relocate_new_kernel_t rnk;
-
- rnk = (relocate_new_kernel_t) image->page_list[1];
- (*rnk)(image->indirection_page, (unsigned long)image->page_list,
- image->start_address, (unsigned long)cpu_has_pae);
-}
-
-#endif /* __X86_KEXEC_X86_32_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/asm-x86/x86_64/kexec.h
--- a/xen/include/asm-x86/x86_64/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/******************************************************************************
- * kexec.h
- *
- * Based heavily on machine_kexec.c and kexec.h from Linux 2.6.19-rc1
- *
- */
-
-#ifndef __X86_64_KEXEC_H__
-#define __X86_64_KEXEC_H__
-
-#include <xen/types.h>
-#include <xen/kexec.h>
-
-typedef void (*relocate_new_kernel_t)(
- unsigned long indirection_page,
- unsigned long page_list,
- unsigned long start_address);
-
-static inline void machine_kexec(xen_kexec_image_t *image)
-{
- relocate_new_kernel_t rnk;
-
- rnk = (relocate_new_kernel_t) image->page_list[1];
- (*rnk)(image->indirection_page, (unsigned long)image->page_list,
- image->start_address);
-}
-
-#endif /* __X86_64_KEXEC_H__ */
-
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 4
- * tab-width: 4
- * indent-tabs-mode: nil
- * End:
- */
diff -r 3fbe12560ffe -r b50350fb0fde xen/include/xen/kexec.h
--- a/xen/include/xen/kexec.h Thu Feb 08 10:44:53 2007 +0000
+++ b/xen/include/xen/kexec.h Thu Feb 08 11:03:29 2007 +0000
@@ -25,6 +25,7 @@ void machine_kexec_unload(int type, int
void machine_kexec_unload(int type, int slot, xen_kexec_image_t *image);
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_crash_save_cpu(void);
crash_xen_info_t *kexec_crash_save_info(void);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home