Re: [PATCH 3/5] ia64: Define elfcorehdr_addr in arch dependent

Simon Horman
2008-07-29T04:42:43Z

On Mon, Jul 28, 2008 at 05:13:14PM -0400, Vivek Goyal wrote:
>
> o Move elfcorehdr_addr definition in arch dependent crash dump file. This is
> equivalent to defining elfcorehdr_addr under CONFIG_CRASH_DUMP instead of
> CONFIG_PROC_VMCORE. This is needed by is_kdump_kernel() which can be
> used irrespective of the fact whether CONFIG_PROC_VMCORE is enabled or
> not.
>
> Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
> ---
>
> arch/ia64/kernel/setup.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff -puN arch/ia64/kernel/setup.c~fix-elfcorehdr_addr-parsing-ia64 arch/ia64/kernel/setup.c
> --- linux-2.6.27-pre-rc1/arch/ia64/kernel/setup.c~fix-elfcorehdr_addr-parsing-ia64 2008-07-28 12:16:40.000000000 -0400
> +++ linux-2.6.27-pre-rc1-root/arch/ia64/kernel/setup.c 2008-07-28 12:16:40.000000000 -0400
> @@ -478,7 +478,12 @@ static __init int setup_nomca(char *s)
> }
> early_param("nomca", setup_nomca);
>
> -#ifdef CONFIG_PROC_VMCORE
> +/*
> + * Note: elfcorehdr_addr is not just limited to vmcore. It is also used by
> + * is_kdump_kernel() to determine if we are booting after a panic. Hence
> + * ifdef it under CONFIG_CRASH_DUMP and not CONFIG_PROC_VMCORE.
> + */
> +#ifdef CONFIG_CRASH_DUMP
> /* elfcorehdr= specifies the location of elf core header
> * stored by the crashed kernel.
> */
> @@ -491,7 +496,9 @@ static int __init parse_elfcorehdr(char
> return 0;
> }
> early_param("elfcorehdr", parse_elfcorehdr);
> +#endif
>
> +#ifdef CONFIG_PROC_VMCORE
> int __init reserve_elfcorehdr(unsigned long *start, unsigned long *end)
> {
> unsigned long length;
> _

Hi Vivek,

I think that you also need the following in arch/ia64/kernel/crash_dump.c.
With this change your code compiles on ia64.

Signed-off-by: Simon Horman <horms@verge.net.au>

Index: linux-2.6/arch/ia64/kernel/crash_dump.c
=================================--- linux-2.6.orig/arch/ia64/kernel/crash_dump.c 2008-07-29 14:06:57.000000000 +1000
+++ linux-2.6/arch/ia64/kernel/crash_dump.c 2008-07-29 14:09:55.000000000 +1000
@@ -8,10 +8,14 @@

#include <linux/errno.h>
#include <linux/types.h>
+#include <linux/crash_dump.h>

#include <asm/page.h>
#include <asm/uaccess.h>

+/* Stores the physical address of elf header of crash image. */
+unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
+
/**
* copy_oldmem_page - copy one page from "oldmem"
* @pfn: page frame number to be copied