diff --git a/SOURCES/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch b/SOURCES/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch new file mode 100644 index 0000000..db33042 --- /dev/null +++ b/SOURCES/fix-callback-functions-given-to-kexec_iomem_for_each_line.patch @@ -0,0 +1,44 @@ +Description: Fix callback functions given to kexec_iomem_for_each_line +Author: Bernhard Übelacker +Bug-Debian: https://bugs.debian.org/771671 +Last-Update: <2014-12-15> + +--- kexec-tools-2.0.7.orig/kexec/arch/i386/crashdump-x86.c ++++ kexec-tools-2.0.7/kexec/arch/i386/crashdump-x86.c +@@ -1041,8 +1041,8 @@ int get_max_crash_kernel_limit(uint64_t + + static int crashkernel_mem_callback(void *UNUSED(data), int nr, + char *UNUSED(str), +- unsigned long base, +- unsigned long length) ++ unsigned long long base, ++ unsigned long long length) + { + if (nr >= CRASH_RESERVED_MEM_NR) + return 1; +--- kexec-tools-2.0.7.orig/kexec/arch/sh/crashdump-sh.c ++++ kexec-tools-2.0.7/kexec/arch/sh/crashdump-sh.c +@@ -34,8 +34,8 @@ static struct memory_range crash_memory_ + static int crash_sh_range_nr; + static int crash_sh_memory_range_callback(void *UNUSED(data), int UNUSED(nr), + char *str, +- unsigned long base, +- unsigned long length) ++ unsigned long long base, ++ unsigned long long length) + { + + struct memory_range *range = crash_memory_range; +--- kexec-tools-2.0.7.orig/kexec/arch/sh/kexec-sh.c ++++ kexec-tools-2.0.7/kexec/arch/sh/kexec-sh.c +@@ -24,8 +24,8 @@ static struct memory_range memory_range[ + + static int kexec_sh_memory_range_callback(void *UNUSED(data), int nr, + char *UNUSED(str), +- unsigned long base, +- unsigned long length) ++ unsigned long long base, ++ unsigned long long length) + { + if (nr < MAX_MEMORY_RANGES) { + memory_range[nr].start = base; diff --git a/SPECS/kexec-tools.spec b/SPECS/kexec-tools.spec index f12a449..8fa594c 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -126,6 +126,8 @@ Patch677: kexec-tools-2.0.8-makedumpfile-Add-module-of-generating-table.patch Patch678: kexec-tools-2.0.8-makedumpfile-Add-module-of-calculating-start_pfn-and.patch Patch679: kexec-tools-2.0.8-makedumpfile-Add-support-for-splitblock-size.patch +Patch799: fix-callback-functions-given-to-kexec_iomem_for_each_line.patch + # # Patch 701 through 800 are meant for kdump anaconda addon # @@ -202,6 +204,9 @@ tar -z -x -v -f %{SOURCE25} %patch678 -p1 %patch679 -p1 +%ifarch i686 +%patch799 -p1 +%endif %ifarch ppc %define archdef ARCH=ppc @@ -423,6 +428,9 @@ done %doc %changelog +* Fri Dec 4 2015 Johnny Hughes - 2.0.7-38 +- add patch 799 for i686 arch + * Wed Oct 21 2015 Minfei Huang - 2.0.7-38 - pc64/ppc64le: drop cpu online rule in 40-redhat.rules in kdump initramfs