Skip to content

Commit

Permalink
sh: shuffle the elfcorehdr handling over to the crash dump code.
Browse files Browse the repository at this point in the history
The elfcorehdr parsing was just tossed in setup.c, but nothing outside of
the crash dump code/vmcore bits require it, so we just move it out of the
way, as per ppc.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed May 7, 2010
1 parent aa424bb commit 7aed3b3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
20 changes: 19 additions & 1 deletion arch/sh/kernel/crash_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
* Created by: Hariprasad Nellitheertha (hari@in.ibm.com)
* Copyright (C) IBM Corporation, 2004. All rights reserved
*/

#include <linux/errno.h>
#include <linux/crash_dump.h>
#include <linux/io.h>
Expand All @@ -13,6 +12,25 @@
/* Stores the physical address of elf header of crash image. */
unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;

/*
* 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.
*
* elfcorehdr= specifies the location of elf core header
* stored by the crashed kernel.
*/
static int __init parse_elfcorehdr(char *arg)
{
if (!arg)
return -EINVAL;

elfcorehdr_addr = memparse(arg, &arg);

return 0;
}
early_param("elfcorehdr", parse_elfcorehdr);

/**
* copy_oldmem_page - copy one page from "oldmem"
* @pfn: page frame number to be copied
Expand Down
19 changes: 0 additions & 19 deletions arch/sh/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -380,25 +380,6 @@ static void __init setup_memory(void)
extern void __init setup_memory(void);
#endif

/*
* 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.
*/
static int __init parse_elfcorehdr(char *arg)
{
if (!arg)
return -EINVAL;
elfcorehdr_addr = memparse(arg, &arg);
return 0;
}
early_param("elfcorehdr", parse_elfcorehdr);
#endif

void __init __attribute__ ((weak)) plat_early_device_setup(void)
{
}
Expand Down

0 comments on commit 7aed3b3

Please sign in to comment.