From 4f56a3958916bcf57f19d19c0728615b3af0bc0919b573bd1e556c50275e905d Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 28 Nov 2008 11:34:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=65

---
 kexec-tools-parse-iomem-single-warning.diff | 30 +++++++++++++++++++++
 kexec-tools.changes                         |  5 ++++
 kexec-tools.spec                            |  6 ++++-
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 kexec-tools-parse-iomem-single-warning.diff

diff --git a/kexec-tools-parse-iomem-single-warning.diff b/kexec-tools-parse-iomem-single-warning.diff
new file mode 100644
index 0000000..060b0c6
--- /dev/null
+++ b/kexec-tools-parse-iomem-single-warning.diff
@@ -0,0 +1,30 @@
+Fix compile warnings in get_memory_ranges()
+
+This patch fixes:
+
+        kexec/arch/i386/kexec-x86-common.c: In function ‘get_memory_ranges’:
+        kexec/arch/i386/kexec-x86-common.c:189: \
+                warning: passing argument 2 of ‘parse_iomem_single’ from incompatible pointer type
+        kexec/arch/i386/kexec-x86-common.c:189: \
+                warning: passing argument 3 of ‘parse_iomem_single’ from incompatible pointer type
+
+Yes, that was my own code. :-(
+
+
+Signed-off-by: Bernhard Walle <bwalle@suse.de>
+
+---
+ kexec/arch/i386/kexec-x86-common.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kexec/arch/i386/kexec-x86-common.c
++++ b/kexec/arch/i386/kexec-x86-common.c
+@@ -181,7 +181,7 @@ int get_memory_ranges(struct memory_rang
+ 	 * subset of user defined values.
+ 	 */
+ 	if (kexec_flags & KEXEC_ON_CRASH) {
+-		unsigned long long start, end;
++		uint64_t start, end;
+ 
+ 		ret = parse_iomem_single("Crash kernel\n", &start, &end);
+ 		if (ret != 0) {
diff --git a/kexec-tools.changes b/kexec-tools.changes
index 2aedd82..7c5105e 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 26 10:05:49 CET 2008 - bwalle@suse.de
+
+- Fix compile warning.
+
 -------------------------------------------------------------------
 Mon Nov 24 23:00:59 CET 2008 - bwalle@suse.de
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index dbe38f4..0230cb4 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -29,7 +29,7 @@ PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 Summary:        Tools for fast kernel loading
 Version:        2.0.0
-Release:        46
+Release:        47
 Source:         %{name}-%{version}.tar.bz2
 Source1:        kexec-bootloader
 Source2:        kexec-bootloader.8.txt
@@ -50,6 +50,7 @@ Patch11:        %{name}-no-vga-output.diff
 Patch12:        %{name}-spell.diff
 Patch13:        %{name}-xen-static.diff
 Patch14:        %{name}-proc-iomem-xen.diff
+Patch15:        %{name}-parse-iomem-single-warning.diff
 Url:            http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  zlib-devel
@@ -94,6 +95,7 @@ Authors:
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %{?suse_update_config -f}
@@ -161,6 +163,8 @@ install -m 0755 kexec.init ${RPM_BUILD_ROOT}/etc/init.d/kexec
 %endif
 
 %changelog
+* Wed Nov 26 2008 bwalle@suse.de
+- Fix compile warning.
 * Mon Nov 24 2008 bwalle@suse.de
 - Read memory map from /proc/iomem instead of /sys/firmware/memmap
   when running under Xen.