Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17b4cceb authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: move elfcorehdr parsing to setup.c 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ce97c40e

arch/x86/kernel/setup.c

+19 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/bootmem.h>

#include <linux/percpu.h>

#include <linux/kexec.h>

#include <linux/crash_dump.h>

#include <asm/smp.h>

#include <asm/percpu.h>

#include <asm/sections.h>
@@ -501,3 +502,21 @@ void __init reserve_standard_io_resources(void) 


}



#ifdef CONFIG_PROC_VMCORE

/* elfcorehdr= specifies the location of elf core header

 * stored by the crashed kernel. This option will be passed

 * by kexec loader to the capture kernel.

 */

static int __init setup_elfcorehdr(char *arg)

{

	char *end;

	if (!arg)

		return -EINVAL;

	elfcorehdr_addr = memparse(arg, &end);

	return end > arg ? 0 : -EINVAL;

}

early_param("elfcorehdr", setup_elfcorehdr);

#endif

arch/x86/kernel/setup_32.c

+0 −16
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <linux/iscsi_ibft.h>

#include <linux/nodemask.h>

#include <linux/kexec.h>

#include <linux/crash_dump.h>

#include <linux/dmi.h>

#include <linux/pfn.h>

#include <linux/pci.h>
@@ -194,21 +193,6 @@ static inline void copy_edd(void) 
}

#endif



#ifdef 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);

#endif /* CONFIG_PROC_VMCORE */



/*

 * highmem=size forces highmem to be exactly 'size' bytes.

 * This works even on boxes that have no highmem otherwise.