From 51c76a6cb6aac6795b969b7a5339cb31058801ca Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Wed, 21 Mar 2007 17:17:22 +0000 Subject: [PATCH] Resolves: bz 233312 --- kexec-tools-1.101-ppc64-memory_regions.patch | 38 ++++++++++++++++++++ kexec-tools.spec | 7 +++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 kexec-tools-1.101-ppc64-memory_regions.patch diff --git a/kexec-tools-1.101-ppc64-memory_regions.patch b/kexec-tools-1.101-ppc64-memory_regions.patch new file mode 100644 index 0000000..4928112 --- /dev/null +++ b/kexec-tools-1.101-ppc64-memory_regions.patch @@ -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; + } + } diff --git a/kexec-tools.spec b/kexec-tools.spec index d80f9bb..bc1bbd6 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 63%{?dist} +Release: 64%{?dist} License: GPL Group: Applications/System 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 Patch304: kexec-tools-1.101-ppc64-platform-fix.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 @@ -116,6 +117,7 @@ rm -f ../kexec-tools-1.101.spec %patch303 -p1 %patch304 -p1 %patch305 -p1 +%patch306 -p1 %patch401 -p1 %patch501 -p1 %patch601 -p1 @@ -237,6 +239,9 @@ rm -f %{_datadir}/firstboot/modules/firstboot_kdump.py %doc kexec-kdump-howto.txt %changelog +* Wed Mar 21 2007 Neil Horman - 1.101-64%{dist} +- Add fix for ppc memory region computation (bz 233312) + * Thu Mar 15 2007 Neil Horman - 1.101-63%{dist} - Adding extra check to avoid oom kills on nfs mount failure (bz 215056)