[kexec-tools/f20] makedumpfile support kernel 3.10

[Baoquan He]

commit 070079dbdc1ba1cbb3e2f7d668bd41387a32e8a9
Author: Baoquan He <bhe at redhat.com>
Date:   Thu Sep 26 17:39:23 2013 +0800

    makedumpfile support kernel 3.10
    
    This is back ported from makedumpfile upstream directly:
    
    commit 1202589997ad008b18276f504c5c2b8529b41dfe
    Author: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
    Date:   Fri Sep 20 09:34:57 2013 +0900
    
        [PATCH] Support newer kernels.
    
         A new makedumpfile supports newer kernels:
    
               - 3.10    (x86 FLATMEM)
               - 3.10    (x86 SPARSEMEM)
               - 3.10    (x86_64 SPARSEMEM)
    
        Signed-off-by: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>

 ...-makedumpfile-PATCH-Support-newer-kernels.patch |   47 ++++++++++++++++++++
 kexec-tools.spec                                   |    2 +
 2 files changed, 49 insertions(+), 0 deletions(-)
---
diff --git a/kexec-tools-2.0.4-makedumpfile-PATCH-Support-newer-kernels.patch b/kexec-tools-2.0.4-makedumpfile-PATCH-Support-newer-kernels.patch
new file mode 100644
index 0000000..5e4ff19
--- /dev/null
+++ b/kexec-tools-2.0.4-makedumpfile-PATCH-Support-newer-kernels.patch
@@ -0,0 +1,47 @@
+From 1202589997ad008b18276f504c5c2b8529b41dfe Mon Sep 17 00:00:00 2001
+Message-Id: <1202589997ad008b18276f504c5c2b8529b41dfe.1380186577.git.bhe at redhat.com>
+From: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
+Date: Fri, 20 Sep 2013 09:34:57 +0900
+Subject: [PATCH] [PATCH] Support newer kernels.
+
+ A new makedumpfile supports newer kernels:
+
+       - 3.10    (x86 FLATMEM)
+       - 3.10    (x86 SPARSEMEM)
+       - 3.10    (x86_64 SPARSEMEM)
+
+Signed-off-by: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
+Signed-off-by: Baoquan He <bhe at redhat.com>
+---
+ README         | 1 +
+ makedumpfile.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/makedumpfile-1.5.4/README b/makedumpfile-1.5.4/README
+index b587485..4e838d8 100644
+--- a/makedumpfile-1.5.4/README
++++ b/makedumpfile-1.5.4/README
+@@ -97,6 +97,7 @@
+   3.7    | OK | ** |    |    |    | ** |    | -- | OK | OK |    |    |
+   3.8    | OK | ** |    |    |    | ** |    | -- | OK | OK |    |    |
+   3.9    | OK | ** |    |    |    | ** |    | -- | OK | OK |    |    |
++  3.10   | OK | ** |    |    |    | ** |    | -- | OK | OK |    |    |
+ 
+   OK    : Support.
+   --    : Not support.
+diff --git a/makedumpfile-1.5.4/makedumpfile.h b/makedumpfile-1.5.4/makedumpfile.h
+index a04154e..c504bfb 100644
+--- a/makedumpfile-1.5.4/makedumpfile.h
++++ b/makedumpfile-1.5.4/makedumpfile.h
+@@ -426,7 +426,7 @@ do { \
+ #define KVER_MIN_SHIFT 16
+ #define KERNEL_VERSION(x,y,z) (((x) << KVER_MAJ_SHIFT) | ((y) << KVER_MIN_SHIFT) | (z))
+ #define OLDEST_VERSION		KERNEL_VERSION(2, 6, 15)/* linux-2.6.15 */
+-#define LATEST_VERSION		KERNEL_VERSION(3, 9, 6)/* linux-3.9.6 */
++#define LATEST_VERSION		KERNEL_VERSION(3, 10, 7)/* linux-3.10.7 */
+ 
+ /*
+  * vmcoreinfo in /proc/vmcore
+-- 
+1.8.3.1
+
diff --git a/kexec-tools.spec b/kexec-tools.spec
index efbb09e..b0775cd 100644
--- a/kexec-tools.spec
+++ b/kexec-tools.spec
@@ -77,6 +77,7 @@ Patch301: kexec-tools-2.0.4-makedumpfile-Add-vmap_area_list-definition-for-ppc-p
 #
 Patch601: kexec-tools-2.0.3-disable-kexec-test.patch
 Patch604: kexec-tools-2.0.3-build-makedumpfile-eppic-shared-object.patch
+Patch605: kexec-tools-2.0.4-makedumpfile-PATCH-Support-newer-kernels.patch
 
 %description
 kexec-tools provides /sbin/kexec binary that facilitates a new
@@ -108,6 +109,7 @@ tar -z -x -v -f %{SOURCE19}
 %patch301 -p1
 %patch601 -p1
 %patch604 -p1
+%patch605 -p1
 
 tar -z -x -v -f %{SOURCE13}