From: Mika Westerberg <mika.westerberg@iki.fi>
To: linux-arm-kernel@lists.infradead.org
Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Subject: [PATCH 1/4] proc/vmcore: allow archs to override vmcore_elf_check_arch()
Date: Tue, 9 Nov 2010 11:06:10 +0200 [thread overview]
Message-ID: <df680f67f33d8b0ef815045b53f205b3ff35de63.1289292124.git.mika.westerberg@iki.fi> (raw)
In-Reply-To: <cover.1289292124.git.mika.westerberg@iki.fi>
In-Reply-To: <cover.1289292124.git.mika.westerberg@iki.fi>
From: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
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 <ext-mika.1.westerberg@nokia.com>
---
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
/*
* is_kdump_kernel() checks whether this kernel is booting after a panic of
--
1.7.2.3
next prev parent reply other threads:[~2010-11-09 9:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 9:06 [PATCH 0/4] ARM kdump fixes Mika Westerberg
2010-11-09 9:06 ` Mika Westerberg [this message]
2010-11-15 7:53 ` [PATCH 1/4] proc/vmcore: allow archs to override vmcore_elf_check_arch() Mika Westerberg
2010-11-16 22:28 ` Andrew Morton
2010-11-16 22:50 ` Russell King - ARM Linux
2010-11-17 10:52 ` Mika Westerberg
2010-11-26 11:02 ` Russell King - ARM Linux
2010-11-09 9:06 ` [PATCH 2/4] ARM: provide zero vmcore_elf64_check_arch() Mika Westerberg
2010-11-09 9:06 ` [PATCH 3/4] ARM: add CONFIG_CRASH_DUMP to Kconfig Mika Westerberg
2010-11-09 9:06 ` [PATCH 4/4] ARM: memblock: convert reserve_crashkernel() to use memblock Mika Westerberg
2010-11-13 13:07 ` Russell King - ARM Linux
2010-11-14 8:25 ` Mika Westerberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=df680f67f33d8b0ef815045b53f205b3ff35de63.1289292124.git.mika.westerberg@iki.fi \
--to=mika.westerberg@iki.fi \
--cc=akpm@linux-foundation.org \
--cc=ext-mika.1.westerberg@nokia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).