Resolves: bz 233312

This commit is contained in:
Neil Horman 2007-03-21 17:17:22 +00:00
parent 42b55e6012
commit 51c76a6cb6
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,38 @@
--- kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.c.orig 2007-03-21 13:08:54.000000000 -0400
+++ kexec-tools-1.101/kexec/arch/ppc64/crashdump-ppc64.c 2007-03-21 13:14:06.000000000 -0400
@@ -143,10 +143,10 @@
if (start < cstart && end > cend) {
match = 1;
crash_memory_range[memory_ranges].start = start;
- crash_memory_range[memory_ranges].end = cstart - 1;
+ crash_memory_range[memory_ranges].end = cstart;
crash_memory_range[memory_ranges].type = RANGE_RAM;
memory_ranges++;
- crash_memory_range[memory_ranges].start = cend + 1;
+ crash_memory_range[memory_ranges].start = cend;
crash_memory_range[memory_ranges].end = end;
crash_memory_range[memory_ranges].type = RANGE_RAM;
memory_ranges++;
@@ -154,18 +154,18 @@
} else if (start < cstart) {
match = 1;
crash_memory_range[memory_ranges].start = start;
- crash_memory_range[memory_ranges].end = cstart - 1;
+ crash_memory_range[memory_ranges].end = cstart;
crash_memory_range[memory_ranges].type = RANGE_RAM;
memory_ranges++;
- end = cstart - 1;
+ end = cstart;
continue;
} else if (end > cend){
match = 1;
- crash_memory_range[memory_ranges].start = cend + 1;
+ crash_memory_range[memory_ranges].start = cend;
crash_memory_range[memory_ranges].end = end;
crash_memory_range[memory_ranges].type = RANGE_RAM;
memory_ranges++;
- start = cend + 1;
+ start = cend;
continue;
}
}

View File

@ -1,6 +1,6 @@
Name: kexec-tools Name: kexec-tools
Version: 1.101 Version: 1.101
Release: 63%{?dist} Release: 64%{?dist}
License: GPL License: GPL
Group: Applications/System Group: Applications/System
Summary: The kexec/kdump userspace component. Summary: The kexec/kdump userspace component.
@ -64,6 +64,7 @@ Patch302: kexec-tools-1.101-ppc64-usage.patch
Patch303: kexec-tools-1.101-ppc64-cliargs.patch Patch303: kexec-tools-1.101-ppc64-cliargs.patch
Patch304: kexec-tools-1.101-ppc64-platform-fix.patch Patch304: kexec-tools-1.101-ppc64-platform-fix.patch
Patch305: kexec-tools-1.101-ppc64-64k-pages.patch Patch305: kexec-tools-1.101-ppc64-64k-pages.patch
Patch306: kexec-tools-1.101-ppc64-memory_regions.patch
# #
# Patches 401 through 500 are meant for s390 kexec-tools enablement # Patches 401 through 500 are meant for s390 kexec-tools enablement
@ -116,6 +117,7 @@ rm -f ../kexec-tools-1.101.spec
%patch303 -p1 %patch303 -p1
%patch304 -p1 %patch304 -p1
%patch305 -p1 %patch305 -p1
%patch306 -p1
%patch401 -p1 %patch401 -p1
%patch501 -p1 %patch501 -p1
%patch601 -p1 %patch601 -p1
@ -237,6 +239,9 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py
%doc kexec-kdump-howto.txt %doc kexec-kdump-howto.txt
%changelog %changelog
* Wed Mar 21 2007 Neil Horman <nhorman@redhat.com> - 1.101-64%{dist}
- Add fix for ppc memory region computation (bz 233312)
* Thu Mar 15 2007 Neil Horman <nhorman@redhat.com> - 1.101-63%{dist} * Thu Mar 15 2007 Neil Horman <nhorman@redhat.com> - 1.101-63%{dist}
- Adding extra check to avoid oom kills on nfs mount failure (bz 215056) - Adding extra check to avoid oom kills on nfs mount failure (bz 215056)