On Fri, Mar 16, 2007 at 07:17:43AM +0000, Ian Campbell wrote: > On Fri, 2007-03-16 at 08:48 +0900, Horms wrote: > > > > > > > > Signed-off-by: Ian Campbell <[EMAIL PROTECTED]> > > > > > > > > diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c > > > > index d960507..523e109 100644 > > > > --- a/fs/proc/vmcore.c > > > > +++ b/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/include/asm-i386/kexec.h b/include/asm-i386/kexec.h > > > > index 4dfc9f5..c76737e 100644 > > > > --- a/include/asm-i386/kexec.h > > > > +++ b/include/asm-i386/kexec.h > > > > @@ -47,6 +47,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) > > > > + > > > > > > Ideal place for this probably should have been arch dependent crash_dump.h > > > file. But we don't have one and no point introducing one just for this > > > macro. > > > > > > This change looks good to me. > > > > Won't the above change break non i386 archtectures as > > vmcore_elf_check_arch_cross isn't defined for them? > > No, because of this hunk:
Thanks, silly me :( -- Horms H: http://www.vergenet.net/~horms/ W: http://www.valinux.co.jp/en/ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
