From a5d626ae3673a3b1a5cb1973711cf8972f711bc82ca77ddd802673c2df24eb2f Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Wed, 12 Aug 2009 23:52:55 +0000
Subject: [PATCH] Accepting request 17510 from Kernel:kdump

Copy from Kernel:kdump/kexec-tools based on submit request 17510 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/17510
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kexec-tools?expand=0&rev=71
---
 kexec-tools-increase-kernel-text-size.diff | 13 +++++++++++++
 kexec-tools.changes                        |  5 +++++
 kexec-tools.spec                           |  4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 kexec-tools-increase-kernel-text-size.diff

diff --git a/kexec-tools-increase-kernel-text-size.diff b/kexec-tools-increase-kernel-text-size.diff
new file mode 100644
index 0000000..ef8aae2
--- /dev/null
+++ b/kexec-tools-increase-kernel-text-size.diff
@@ -0,0 +1,13 @@
+diff --git a/kexec/arch/x86_64/crashdump-x86_64.h b/kexec/arch/x86_64/crashdump-x86_64.h
+index 9f4dee9..0e83527 100644
+--- a/kexec/arch/x86_64/crashdump-x86_64.h
++++ b/kexec/arch/x86_64/crashdump-x86_64.h
+@@ -11,7 +11,7 @@ int load_crashdump_segments(struct kexec_info *info, char *mod_cmdline,
+ #define MAXMEM           0x3fffffffffffUL
+ 
+ /* Kernel text size */
+-#define KERNEL_TEXT_SIZE  (40UL*1024*1024)
++#define KERNEL_TEXT_SIZE  (512UL*1024*1024)
+ 
+ #define CRASH_MAX_MEMMAP_NR	(KEXEC_MAX_SEGMENTS + 1)
+ #define CRASH_MAX_MEMORY_RANGES	(MAX_MEMORY_RANGES + 2)
diff --git a/kexec-tools.changes b/kexec-tools.changes
index fabec0d..8f95614 100644
--- a/kexec-tools.changes
+++ b/kexec-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 12 09:46:46 CEST 2009 - tiwai@suse.de
+
+- increase kernel text size to fix for 2.6.31 kernel (bnc#530240)
+
 -------------------------------------------------------------------
 Sun Jul 12 14:22:02 CEST 2009 - coolo@novell.com
 
diff --git a/kexec-tools.spec b/kexec-tools.spec
index 5b90abe..55d67af 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:        55
+Release:        56
 Source:         %{name}-%{version}.tar.bz2
 Source1:        kexec-bootloader
 Source2:        kexec-bootloader.8.txt
@@ -57,6 +57,7 @@ Patch18:        %{name}-ppc64-dynamic-fix-1.diff
 Patch19:        %{name}-ppc64-dynamic-fix-2.diff
 Patch20:        %{name}-ppc64-dynamic-fix-3.diff
 Patch21:        %{name}-ppc64-reinit.diff
+Patch22:        %{name}-increase-kernel-text-size.diff
 Url:            http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #!BuildIgnore:  fop
@@ -109,6 +110,7 @@ Authors:
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 # disable as-needed