# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID 6f0f80aa817de63ff730098a54e333c9bac776d6
# Parent 562eee7568a87ca783bc69787c9c15d04688b82d
[LINUX] Kexec: Remove remainder of kexec-generic.patch
Rename xen_machine_kexec() to just machine_kexec() and only compile in
the Xen or native version as appropriate.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
patches/linux-2.6.16.33/kexec-generic.patch | 14 --------------
linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c | 2 ++
linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c | 2 ++
linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c | 2 +-
linux-2.6-xen-sparse/include/linux/kexec.h | 1 -
linux-2.6-xen-sparse/kernel/kexec.c | 4 ----
patches/linux-2.6.16.33/series | 1 -
7 files changed, 5 insertions(+), 21 deletions(-)
diff -r 562eee7568a8 -r 6f0f80aa817d
linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
@@ -92,6 +92,7 @@ void machine_kexec_cleanup(struct kimage
{
}
+#ifndef CONFIG_XEN
/*
* Do not allocate memory (or fail in any way) in machine_kexec().
* We are past the point of no return, committed to rebooting now.
@@ -125,3 +126,4 @@ NORET_TYPE void machine_kexec(struct kim
relocate_kernel((unsigned long)image->head, (unsigned long)page_list,
image->start, cpu_has_pae);
}
+#endif
diff -r 562eee7568a8 -r 6f0f80aa817d
linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
@@ -237,6 +237,7 @@ void machine_kexec_cleanup(struct kimage
return;
}
+#ifndef CONFIG_XEN
/*
* Do not allocate memory (or fail in any way) in machine_kexec().
* We are past the point of no return, committed to rebooting now.
@@ -275,3 +276,4 @@ NORET_TYPE void machine_kexec(struct kim
relocate_kernel((unsigned long)image->head, (unsigned long)page_list,
image->start);
}
+#endif
diff -r 562eee7568a8 -r 6f0f80aa817d
linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c Fri Dec 08
11:47:09 2006 +0000
@@ -163,7 +163,7 @@ void xen_machine_kexec_unload(struct kim
* stop all CPUs and kexec. That is it combines machine_shutdown()
* and machine_kexec() in Linux kexec terms.
*/
-NORET_TYPE void xen_machine_kexec(struct kimage *image)
+NORET_TYPE void machine_kexec(struct kimage *image)
{
xen_kexec_exec_t xke;
diff -r 562eee7568a8 -r 6f0f80aa817d linux-2.6-xen-sparse/include/linux/kexec.h
--- a/linux-2.6-xen-sparse/include/linux/kexec.h Fri Dec 08 11:47:09
2006 +0000
+++ b/linux-2.6-xen-sparse/include/linux/kexec.h Fri Dec 08 11:47:09
2006 +0000
@@ -101,7 +101,6 @@ extern void machine_kexec_cleanup(struct
#ifdef CONFIG_XEN
extern int xen_machine_kexec_load(struct kimage *image);
extern void xen_machine_kexec_unload(struct kimage *image);
-extern NORET_TYPE void xen_machine_kexec(struct kimage *image) ATTRIB_NORET;
extern void xen_machine_kexec_setup_resources(void);
extern void xen_machine_kexec_register_resources(struct resource *res);
#endif
diff -r 562eee7568a8 -r 6f0f80aa817d linux-2.6-xen-sparse/kernel/kexec.c
--- a/linux-2.6-xen-sparse/kernel/kexec.c Fri Dec 08 11:47:09 2006 +0000
+++ b/linux-2.6-xen-sparse/kernel/kexec.c Fri Dec 08 11:47:09 2006 +0000
@@ -1085,11 +1085,7 @@ void crash_kexec(struct pt_regs *regs)
struct pt_regs fixed_regs;
crash_setup_regs(&fixed_regs, regs);
machine_crash_shutdown(&fixed_regs);
-#ifdef CONFIG_XEN
- xen_machine_kexec(image);
-#else
machine_kexec(image);
-#endif
}
xchg(&kexec_lock, 0);
}
diff -r 562eee7568a8 -r 6f0f80aa817d patches/linux-2.6.16.33/series
--- a/patches/linux-2.6.16.33/series Fri Dec 08 11:47:09 2006 +0000
+++ b/patches/linux-2.6.16.33/series Fri Dec 08 11:47:09 2006 +0000
@@ -1,4 +1,3 @@ kexec-generic.patch
-kexec-generic.patch
git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch
git-2a8a3d5b65e86ec1dfef7d268c64a909eab94af7.patch
git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch
diff -r 562eee7568a8 -r 6f0f80aa817d patches/linux-2.6.16.33/kexec-generic.patch
--- a/patches/linux-2.6.16.33/kexec-generic.patch Fri Dec 08 11:47:09
2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- 0002/kernel/sys.c
-+++ work/kernel/sys.c
-@@ -435,8 +435,12 @@ void kernel_kexec(void)
- kernel_restart_prepare(NULL);
- printk(KERN_EMERG "Starting new kernel\n");
- machine_shutdown();
-+#ifdef CONFIG_XEN
-+ xen_machine_kexec(image);
-+#else
- machine_kexec(image);
- #endif
-+#endif
- }
- EXPORT_SYMBOL_GPL(kernel_kexec);
-
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home