From 43f70c18027a5f43b34485c4119855d186482651 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Feb 17 2016 03:10:44 +0000
Subject: Roll in i686 Mods


---

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 <bernhardu@vr-web.de>
+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 db8393a..13874a9 100644
--- a/SPECS/kexec-tools.spec
+++ b/SPECS/kexec-tools.spec
@@ -132,6 +132,8 @@ Patch681: kexec-tools-2.0.8-makedumpfile-sadump-Perform-explicit-zero-page-filte
 # Patch 701 through 800 are meant for kdump anaconda addon
 #
 
+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
@@ -206,6 +208,9 @@ tar -z -x -v -f %{SOURCE25}
 %patch680 -p1
 %patch681 -p1
 
+%ifarch i686
+%patch799 -p1
++%endif
 
 %ifarch ppc
 %define archdef ARCH=ppc
@@ -427,6 +432,9 @@ done
 %doc
 
 %changelog
+* Tue Feb 16 2016 Johnny Hughes <johnny@centos.org>  - 2.0.7-38.1
+- Roll in i686 Mods
+
 * Fri Jan 15 2016 Minfei Huang <mhuang@redhat.com> - 2.0.7-38.1
 - Makedumpfile: Fix to copy some parts of memory in sadump vmcore formats