forked from pool/kexec-tools
This commit is contained in:
parent
f23160031a
commit
60be563ec2
37
kexec-tools-elf32-elf64-fix
Normal file
37
kexec-tools-elf32-elf64-fix
Normal file
@ -0,0 +1,37 @@
|
||||
From b41eacb1069eeefd630d807b1587247e6d89628c Mon Sep 17 00:00:00 2001
|
||||
From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
|
||||
Date: Tue, 13 Nov 2007 19:29:16 +0900
|
||||
Subject: [PATCH] Fix the feature determining ELF32/ELF64 automatically
|
||||
|
||||
Hi,
|
||||
|
||||
This patch fixes the problem that the kexec command cannot determine
|
||||
ELF32/ELF64 automatically.
|
||||
|
||||
On i386 system, the kexec command always determined an ELF32 /proc/vmcore
|
||||
even if the memory is 4GB or larger, because of referring the outside
|
||||
of the array "range[]".
|
||||
|
||||
|
||||
Thanks
|
||||
Ken'ichi Ohmichi
|
||||
|
||||
|
||||
Signed-off-by: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
|
||||
Signed-off-by: Simon Horman <horms@verge.net.au>
|
||||
|
||||
---
|
||||
kexec/arch/i386/crashdump-x86.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/kexec/arch/i386/crashdump-x86.c
|
||||
+++ b/kexec/arch/i386/crashdump-x86.c
|
||||
@@ -528,7 +528,7 @@ static enum coretype get_core_type(struc
|
||||
if (ranges == 0)
|
||||
return CORE_TYPE_ELF64;
|
||||
|
||||
- if (range[ranges].end > 0xFFFFFFFFUL)
|
||||
+ if (range[ranges - 1].end > 0xFFFFFFFFUL)
|
||||
return CORE_TYPE_ELF64;
|
||||
else
|
||||
return CORE_TYPE_ELF32;
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 30 10:52:03 CET 2007 - bwalle@suse.de
|
||||
|
||||
- fix a problem with automatic determination of ELF32/ELF64 on i386
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 30 08:46:49 CET 2007 - bwalle@suse.de
|
||||
|
||||
|
@ -22,13 +22,14 @@ Requires: %insserv_prereq %fillup_prereq
|
||||
AutoReqProv: on
|
||||
Summary: Tools for fast kernel loading
|
||||
Version: 1.101
|
||||
Release: 146
|
||||
Release: 153
|
||||
Source: %{name}-%{package_version}.tar.bz2
|
||||
Source1: README.SUSE
|
||||
Url: http://www.vergenet.net/linux/kexec/kexec-tools/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: zlib-devel
|
||||
Patch1: kexec-longer-cmdline.diff
|
||||
Patch2: kexec-tools-elf32-elf64-fix
|
||||
Patch20: kexec-tools.ppc64-32bit-build.patch
|
||||
Patch21: kexec-tools.ppc32-64bit-purgatory.patch
|
||||
Patch22: kexec-tools.gcc-bug.patch
|
||||
@ -53,6 +54,7 @@ Authors:
|
||||
%prep
|
||||
%setup -q -n kexec-tools-%{package_version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
#
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
@ -90,7 +92,10 @@ install -c -m 0644 kexec/kexec.8 $RPM_BUILD_ROOT%{_mandir}/man8
|
||||
%ifarch %ix86 x86_64
|
||||
/%_lib/kexec-tools*
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Nov 30 2007 - bwalle@suse.de
|
||||
- fix a problem with automatic determination of ELF32/ELF64 on i386
|
||||
* Tue Oct 30 2007 - bwalle@suse.de
|
||||
- update to kexec-tools-testing 20071030
|
||||
o vmcoreinfo's address and size
|
||||
|
Loading…
Reference in New Issue
Block a user