From: akpm@linux-foundation.org (Andrew Morton) Date: Tue, 16 Nov 2010 14:28:50 -0800 Subject: [PATCH 1/4] proc/vmcore: allow archs to override vmcore_elf_check_arch() In-Reply-To: References: Message-ID: <20101116142850.df5e9805.akpm@linux-foundation.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Tue, 9 Nov 2010 11:06:10 +0200 Mika Westerberg wrote: > From: Mika Westerberg > > 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: Mika Westerberg > --- > fs/proc/vmcore.c | 2 +- > include/linux/crash_dump.h | 9 ++++++++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c > index 2367fb3..74802bc5 100644 > --- a/fs/proc/vmcore.c > +++ b/fs/proc/vmcore.c > @@ -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 || > diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h > index 0026f26..088cd4a 100644 > --- a/include/linux/crash_dump.h > +++ b/include/linux/crash_dump.h > @@ -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 > Looks OK to me. I'd suggest that this patch be merged along with the others, via whatever tree they're taken into. Russell's ARM tree, I assume. Should elf_check_arch() be renamed to elf64_check_arch()? Ditto vmcore_elf_check_arch_cross()?