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 4288482..60b4349 100644 --- a/SPECS/kexec-tools.spec +++ b/SPECS/kexec-tools.spec @@ -127,6 +127,9 @@ Patch680: kexec-tools-2.0.8-fs2dt.c-move-copy-old-root-param-as-a-new-function.p # Patch 701 through 800 are meant for kdump anaconda addon # +#CentOS patch for i686 +Patch799: fix-callback-functions-given-to-kexec_iomem_for_each_line.patch + %description kexec-tools provides /sbin/kexec binary that facilitates a new kernel to boot using the kernel's kexec feature either on a @@ -194,6 +197,9 @@ tar -z -x -v -f %{SOURCE25} %patch680 -p1 %patch305 -p1 +%ifarch i686 +%patch799 -p1 +%endif %ifarch ppc %define archdef ARCH=ppc @@ -415,6 +421,9 @@ done %doc %changelog +* Thu Dec 22 2016 Johnny Hughes - 2.0.7-50 +- Roll in i686 Mods + * Mon Sep 05 2016 Baoquan He - 2.0.7-50 - spec: Update to add dependency on dracut-network version >= 033-449 - mkdumprd: Do not add "nfs" dracut module explicitly