From 3022649e82b64d4a4c059130e71d71b15ffe1acf Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@xensource.com>
Date: Wed, 2 May 2007 19:27:09 +0200
Subject: [PATCH] --- yaml --- r: 53802 b: refs/heads/master c:
 79e030114a8d97a1dcd593ab84fb986f8c91c536 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/fs/proc/vmcore.c           | 2 +-
 trunk/include/asm-i386/kexec.h   | 3 +++
 trunk/include/linux/crash_dump.h | 8 ++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3d1e96977d33..f1fc2c429912 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eab0c72aecd7982b2c848f7d493ba379efcef15e
+refs/heads/master: 79e030114a8d97a1dcd593ab84fb986f8c91c536
diff --git a/trunk/fs/proc/vmcore.c b/trunk/fs/proc/vmcore.c
index d96050728c43..523e1098ae88 100644
--- a/trunk/fs/proc/vmcore.c
+++ b/trunk/fs/proc/vmcore.c
@@ -514,7 +514,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) ||
-		!elf_check_arch(&ehdr) ||
+		!vmcore_elf_check_arch(&ehdr) ||
 		ehdr.e_ident[EI_CLASS] != ELFCLASS64 ||
 		ehdr.e_ident[EI_VERSION] != EV_CURRENT ||
 		ehdr.e_version != EV_CURRENT ||
diff --git a/trunk/include/asm-i386/kexec.h b/trunk/include/asm-i386/kexec.h
index c5b4ab95bdc2..bcb5b21de2d2 100644
--- a/trunk/include/asm-i386/kexec.h
+++ b/trunk/include/asm-i386/kexec.h
@@ -42,6 +42,9 @@
 /* The native architecture */
 #define KEXEC_ARCH KEXEC_ARCH_386
 
+/* We can also handle crash dumps from 64 bit kernel. */
+#define vmcore_elf_check_arch_cross(x) ((x)->e_machine == EM_X86_64)
+
 #define MAX_NOTE_BYTES 1024
 
 /* CPU does not save ss and esp on stack if execution is already
diff --git a/trunk/include/linux/crash_dump.h b/trunk/include/linux/crash_dump.h
index 32503657f14f..22c7ac5cd80c 100644
--- a/trunk/include/linux/crash_dump.h
+++ b/trunk/include/linux/crash_dump.h
@@ -14,5 +14,13 @@ extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
 extern const struct file_operations proc_vmcore_operations;
 extern struct proc_dir_entry *proc_vmcore;
 
+/* Architecture code defines this if there are other possible ELF
+ * machine types, e.g. on bi-arch capable hardware. */
+#ifndef vmcore_elf_check_arch_cross
+#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))
+
 #endif /* CONFIG_CRASH_DUMP */
 #endif /* LINUX_CRASHDUMP_H */