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

Commit 15f2a796 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branches 'sh/clkfwk' and 'sh/kexec'

parents 4f615d57 7aed3b34

arch/sh/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ config KEXEC 


config CRASH_DUMP

	bool "kernel crash dumps (EXPERIMENTAL)"

	depends on SUPERH32 && EXPERIMENTAL

	depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP

	help

	  Generate crash dump after being started by kexec.

	  This should be normally only set in special crash dump kernels

arch/sh/kernel/crash_dump.c

+19 −1
Original line number Diff line number Diff line
@@ -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>
@@ -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

arch/sh/kernel/machine_kexec.c

+3 −0
Original line number Diff line number Diff line
@@ -147,4 +147,7 @@ void arch_crash_save_vmcoreinfo(void) 
	VMCOREINFO_SYMBOL(node_data);

	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);

#endif

#ifdef CONFIG_X2TLB

	VMCOREINFO_CONFIG(X2TLB);

#endif

}

arch/sh/kernel/setup.c

+0 −19
Original line number Diff line number Diff line
@@ -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)

{

}