ia64/xen-unstable

changeset 12877:6f0f80aa817d

[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>
author Ian Campbell <ian.campbell@xensource.com>
date Fri Dec 08 11:47:09 2006 +0000 (2006-12-08)
parents 562eee7568a8
children da87dc126b33
files linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c linux-2.6-xen-sparse/include/linux/kexec.h linux-2.6-xen-sparse/kernel/kexec.c patches/linux-2.6.16.33/kexec-generic.patch patches/linux-2.6.16.33/series
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     1.3 @@ -92,6 +92,7 @@ void machine_kexec_cleanup(struct kimage
     1.4  {
     1.5  }
     1.6  
     1.7 +#ifndef CONFIG_XEN
     1.8  /*
     1.9   * Do not allocate memory (or fail in any way) in machine_kexec().
    1.10   * We are past the point of no return, committed to rebooting now.
    1.11 @@ -125,3 +126,4 @@ NORET_TYPE void machine_kexec(struct kim
    1.12  	relocate_kernel((unsigned long)image->head, (unsigned long)page_list,
    1.13  			image->start, cpu_has_pae);
    1.14  }
    1.15 +#endif
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     2.3 @@ -237,6 +237,7 @@ void machine_kexec_cleanup(struct kimage
     2.4  	return;
     2.5  }
     2.6  
     2.7 +#ifndef CONFIG_XEN
     2.8  /*
     2.9   * Do not allocate memory (or fail in any way) in machine_kexec().
    2.10   * We are past the point of no return, committed to rebooting now.
    2.11 @@ -275,3 +276,4 @@ NORET_TYPE void machine_kexec(struct kim
    2.12  	relocate_kernel((unsigned long)image->head, (unsigned long)page_list,
    2.13  			image->start);
    2.14  }
    2.15 +#endif
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/core/machine_kexec.c	Fri Dec 08 11:47:09 2006 +0000
     3.3 @@ -163,7 +163,7 @@ void xen_machine_kexec_unload(struct kim
     3.4   * stop all CPUs and kexec. That is it combines machine_shutdown()
     3.5   * and machine_kexec() in Linux kexec terms.
     3.6   */
     3.7 -NORET_TYPE void xen_machine_kexec(struct kimage *image)
     3.8 +NORET_TYPE void machine_kexec(struct kimage *image)
     3.9  {
    3.10  	xen_kexec_exec_t xke;
    3.11  
     4.1 --- a/linux-2.6-xen-sparse/include/linux/kexec.h	Fri Dec 08 11:47:09 2006 +0000
     4.2 +++ b/linux-2.6-xen-sparse/include/linux/kexec.h	Fri Dec 08 11:47:09 2006 +0000
     4.3 @@ -101,7 +101,6 @@ extern void machine_kexec_cleanup(struct
     4.4  #ifdef CONFIG_XEN
     4.5  extern int xen_machine_kexec_load(struct kimage *image);
     4.6  extern void xen_machine_kexec_unload(struct kimage *image);
     4.7 -extern NORET_TYPE void xen_machine_kexec(struct kimage *image) ATTRIB_NORET;
     4.8  extern void xen_machine_kexec_setup_resources(void);
     4.9  extern void xen_machine_kexec_register_resources(struct resource *res);
    4.10  #endif
     5.1 --- a/linux-2.6-xen-sparse/kernel/kexec.c	Fri Dec 08 11:47:09 2006 +0000
     5.2 +++ b/linux-2.6-xen-sparse/kernel/kexec.c	Fri Dec 08 11:47:09 2006 +0000
     5.3 @@ -1085,11 +1085,7 @@ void crash_kexec(struct pt_regs *regs)
     5.4  			struct pt_regs fixed_regs;
     5.5  			crash_setup_regs(&fixed_regs, regs);
     5.6  			machine_crash_shutdown(&fixed_regs);
     5.7 -#ifdef CONFIG_XEN
     5.8 -			xen_machine_kexec(image);
     5.9 -#else
    5.10  			machine_kexec(image);
    5.11 -#endif
    5.12  		}
    5.13  		xchg(&kexec_lock, 0);
    5.14  	}
     6.1 --- a/patches/linux-2.6.16.33/kexec-generic.patch	Fri Dec 08 11:47:09 2006 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,15 +0,0 @@
     6.4 ---- 0002/kernel/sys.c
     6.5 -+++ work/kernel/sys.c
     6.6 -@@ -435,8 +435,12 @@ void kernel_kexec(void)
     6.7 - 	kernel_restart_prepare(NULL);
     6.8 - 	printk(KERN_EMERG "Starting new kernel\n");
     6.9 - 	machine_shutdown();
    6.10 -+#ifdef CONFIG_XEN
    6.11 -+	xen_machine_kexec(image);
    6.12 -+#else
    6.13 - 	machine_kexec(image);
    6.14 - #endif
    6.15 -+#endif
    6.16 - }
    6.17 - EXPORT_SYMBOL_GPL(kernel_kexec);
    6.18 - 
     7.1 --- a/patches/linux-2.6.16.33/series	Fri Dec 08 11:47:09 2006 +0000
     7.2 +++ b/patches/linux-2.6.16.33/series	Fri Dec 08 11:47:09 2006 +0000
     7.3 @@ -1,4 +1,3 @@
     7.4 -kexec-generic.patch
     7.5  git-2efe55a9cec8418f0e0cde3dc3787a42fddc4411.patch
     7.6  git-2a8a3d5b65e86ec1dfef7d268c64a909eab94af7.patch
     7.7  git-3566561bfadffcb5dbc85d576be80c0dbf2cccc9.patch