diff options
| author | Ian Campbell <ian.campbell@xensource.com> | 2006-12-08 11:47:09 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@xensource.com> | 2006-12-08 11:47:09 +0000 |
| commit | c720eb6ab76d4b6699d022182daf014df3507d97 (patch) | |
| tree | 0537270c8174e8a83fbb3c975c26f1e7879e9c38 /patches | |
| parent | 69f0c953b4257eb4f3956b6240278f834b7e8ba1 (diff) | |
| download | xen-c720eb6ab76d4b6699d022182daf014df3507d97.tar.gz xen-c720eb6ab76d4b6699d022182daf014df3507d97.tar.bz2 xen-c720eb6ab76d4b6699d022182daf014df3507d97.zip | |
[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@xensource.com>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/linux-2.6.16.33/kexec-generic.patch | 15 | ||||
| -rw-r--r-- | patches/linux-2.6.16.33/series | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/patches/linux-2.6.16.33/kexec-generic.patch b/patches/linux-2.6.16.33/kexec-generic.patch deleted file mode 100644 index a85d546e4d..0000000000 --- a/patches/linux-2.6.16.33/kexec-generic.patch +++ /dev/null @@ -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); - diff --git a/patches/linux-2.6.16.33/series b/patches/linux-2.6.16.33/series index 604aed27e9..28fabf00ff 100644 --- a/patches/linux-2.6.16.33/series +++ b/patches/linux-2.6.16.33/series @@ -1,4 +1,3 @@ -kexec-generic.patch git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch git-2a8a3d5b65e86ec1dfef7d268c64a909eab94af7.patch git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch |