Anton Vorontsov writes:

> From: Dale Farnsworth <d...@farnsworth.org>
> 
> Refactor the setting of kexec OF properties, moving the common code
> from machine_kexec_64.c to machine_kexec.c where it can be used on
> both ppc64 and ppc32.  This will be needed for kdump to work on ppc32
> platforms.
> 
> Signed-off-by: Dale Farnsworth <d...@farnsworth.org>
> Signed-off-by: Anton Vorontsov <avoront...@ru.mvista.com>
> ---
>  arch/powerpc/kernel/machine_kexec.c    |   36 ++++++++++++++++++++
>  arch/powerpc/kernel/machine_kexec_64.c |   56 ++-----------------------------
>  2 files changed, 40 insertions(+), 52 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/machine_kexec.c 
> b/arch/powerpc/kernel/machine_kexec.c
> index 4f797c0..b3abebb 100644
> --- a/arch/powerpc/kernel/machine_kexec.c
> +++ b/arch/powerpc/kernel/machine_kexec.c
> @@ -120,6 +120,7 @@ int overlaps_crashkernel(unsigned long start, unsigned 
> long size)
>  
>  /* Values we need to export to the second kernel via the device tree. */
>  static unsigned long kernel_end;
> +static unsigned long crashk_size;
>  
>  static struct property kernel_end_prop = {
>       .name = "linux,kernel-end",

This patch doesn't apply.  The current version of machine_kexec.c ends
with overlaps_crashkernel.  There's no kernel_end or kernel_end_prop
in that file.  Is there a preceding patch that needs to be applied
first?

Paul.
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Reply via email to