On Fri, 2008-08-01 at 18:14 +0400, Anton Vorontsov wrote: > From: Dale Farnsworth <[EMAIL PROTECTED]> > > 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.
Hi Anton,
> diff --git a/arch/powerpc/kernel/machine_kexec.c
> b/arch/powerpc/kernel/machine_kexec.c
> index ac42cfb..bfef717 100644
> --- a/arch/powerpc/kernel/machine_kexec.c
> +++ b/arch/powerpc/kernel/machine_kexec.c
> @@ -117,6 +117,7 @@ int overlaps_crashkernel(unsigned long start, unsigned
> long size)
>
> static int __init kexec_setup(void)
> {
> struct device_node *node;
> @@ -135,6 +171,8 @@ static int __init kexec_setup(void)
> kernel_end = __pa(_end);
> prom_add_property(node, &kernel_end_prop);
>
> + export_crashk_values(node);
> +
> of_node_put(node);
> return 0;
> }
> diff --git a/arch/powerpc/kernel/machine_kexec_64.c
> b/arch/powerpc/kernel/machine_kexec_64.c
> index c30678d..2aab296 100644
> --- a/arch/powerpc/kernel/machine_kexec_64.c
> +++ b/arch/powerpc/kernel/machine_kexec_64.c
...
> -
> static int __init kexec_setup(void)
> {
> export_htab_values();
> - export_crashk_values();
> return 0;
> }
> __initcall(kexec_setup);
This leaves us with two routines called kexec_setup(), do you mind
getting rid of this one and making export_htab_values() an initcall
directly.
cheers
--
Michael Ellerman
OzLabs, IBM Australia Development Lab
wwweb: http://michael.ellerman.id.au
phone: +61 2 6212 1183 (tie line 70 21183)
We do not inherit the earth from our ancestors,
we borrow it from our children. - S.M.A.R.T Person
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev
