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

Commit 9833c394 authored by Mika Westerberg's avatar Mika Westerberg Committed by Russell King
Browse files

ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch() 



Allow architectures to redefine this macro if needed. This is useful for
example in architectures where 64-bit ELF vmcores are not supported.
Specifying zero vmcore_elf64_check_arch() allows compiler to optimize
away unnecessary parts of parse_crash_elf64_headers().

We also rename the macro to vmcore_elf64_check_arch() to reflect that it
is used for 64-bit vmcores only.

Signed-off-by: default avatarMika Westerberg <mika.westerberg@iki.fi>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e8a7e48b

fs/proc/vmcore.c

+1 −1
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static int __init parse_crash_elf64_headers(void) 
	/* Do some basic Verification. */

	if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 ||

		(ehdr.e_type != ET_CORE) ||

		!vmcore_elf_check_arch(&ehdr) ||

		!vmcore_elf64_check_arch(&ehdr) ||

		ehdr.e_ident[EI_CLASS] != ELFCLASS64 ||

		ehdr.e_ident[EI_VERSION] != EV_CURRENT ||

		ehdr.e_version != EV_CURRENT ||

include/linux/crash_dump.h

+8 −1
Original line number Diff line number Diff line
@@ -20,7 +20,14 @@ extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, 
#define vmcore_elf_check_arch_cross(x) 0

#endif



#define vmcore_elf_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x))

/*

 * Architecture code can redefine this if there are any special checks

 * needed for 64-bit ELF vmcores. In case of 32-bit only architecture,

 * this can be set to zero.

 */

#ifndef vmcore_elf64_check_arch

#define vmcore_elf64_check_arch(x) (elf_check_arch(x) || vmcore_elf_check_arch_cross(x))

#endif



/*

 * is_kdump_kernel() checks whether this kernel is booting after a panic of