diff --git a/kexec-tools-callback-function-proto.patch b/kexec-tools-callback-function-proto.patch
new file mode 100644
index 0000000..ef09302
--- /dev/null
+++ b/kexec-tools-callback-function-proto.patch
@@ -0,0 +1,45 @@
+From: Bernhard Übelacker <bernhardu@vr-web.de>
+Subject: Fix callback functions given to kexec_iomem_for_each_line
+References: https://bugs.debian.org/771671
+References: bnc#905090
+Upstream: pending
+
+--- 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/kexec-tools.changes b/kexec-tools.changes
index fe0aa10..e1e2b5b 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan  9 02:13:57 UTC 2015 - tonyj@suse.com
+
+- Fix x86 callback prototypes (bnc#905090)
+  Add patch: kexec-tools-callback-function-proto.patch
+
 -------------------------------------------------------------------
 Thu Oct  9 16:38:05 UTC 2014 - ptesarik@suse.cz
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 628de6e..eba3dd8 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kexec-tools
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,7 +37,8 @@ Patch1:         %{name}-xen-static.patch
 Patch2:         %{name}-xen-balloon-up.patch
 Patch3:         %{name}-disable-test.patch
 Patch4:         %{name}-enable-aarch64.patch
-Patch6:         %{name}-enable-aarch64-fixup.patch
+Patch5:         %{name}-enable-aarch64-fixup.patch
+Patch6:         %{name}-callback-function-proto.patch
 
 Url:            ftp://kernel.org/pub/linux/utils/kernel/kexec/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -63,6 +64,7 @@ the loaded kernel after it panics.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch6 -p1
 
 %build