diff --git a/kexec-tools-2.0.15-makedumpfile-take-care-of-init-level4-pgt-rename-in-kernel.patch b/kexec-tools-2.0.15-makedumpfile-take-care-of-init-level4-pgt-rename-in-kernel.patch new file mode 100644 index 0000000..721f04a --- /dev/null +++ b/kexec-tools-2.0.15-makedumpfile-take-care-of-init-level4-pgt-rename-in-kernel.patch @@ -0,0 +1,43 @@ +Following commit renamed init_level4_pgt to init_top_pgt in kernel. + +commit 65ade2f872b474fa8a04c2d397783350326634e6 +Author: Kirill A. Shutemov +Date: Tue Jun 6 14:31:27 2017 +0300 + + x86/boot/64: Rename init_level4_pgt and early_level4_pgt + +This patch takes care of above kernel modification in makedumpfile. + +Signed-off-by: Pratyush Anand +--- +v2 -> v1 +Removed redundant 'if condition' for WRITE_SYMBOL(). + + makedumpfile.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git kexec-tools-2.0.15/makedumpfile-1.6.2/makedumpfile.c kexec-tools-2.0.15.new/makedumpfile-1.6.2/makedumpfile.c +index f85003a33551..30230a15a2e7 100644 +--- kexec-tools-2.0.15/makedumpfile-1.6.2/makedumpfile.c ++++ kexec-tools-2.0.15.new/makedumpfile-1.6.2/makedumpfile.c +@@ -1486,6 +1486,8 @@ get_symbol_info(void) + SYMBOL_INIT(_stext, "_stext"); + SYMBOL_INIT(swapper_pg_dir, "swapper_pg_dir"); + SYMBOL_INIT(init_level4_pgt, "init_level4_pgt"); ++ if (SYMBOL(init_level4_pgt) == NOT_FOUND_SYMBOL) ++ SYMBOL_INIT(init_level4_pgt, "init_top_pgt"); + SYMBOL_INIT(vmlist, "vmlist"); + SYMBOL_INIT(vmap_area_list, "vmap_area_list"); + SYMBOL_INIT(node_online_map, "node_online_map"); +@@ -2500,6 +2502,8 @@ read_vmcoreinfo(void) + READ_SYMBOL("_stext", _stext); + READ_SYMBOL("swapper_pg_dir", swapper_pg_dir); + READ_SYMBOL("init_level4_pgt", init_level4_pgt); ++ if (SYMBOL(init_level4_pgt) == NOT_FOUND_SYMBOL) ++ READ_SYMBOL("init_top_pgt", init_level4_pgt); + READ_SYMBOL("vmlist", vmlist); + READ_SYMBOL("vmap_area_list", vmap_area_list); + READ_SYMBOL("node_online_map", node_online_map); +-- +2.9.4 + diff --git a/kexec-tools.spec b/kexec-tools.spec index 51c41a4..b590af6 100644 --- a/kexec-tools.spec +++ b/kexec-tools.spec @@ -1,6 +1,6 @@ Name: kexec-tools Version: 2.0.15 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System Summary: The kexec/kdump userspace component @@ -85,6 +85,7 @@ Obsoletes: diskdumputils netdump kexec-tools-eppic # Patches 601 onward are generic patches # Patch601: kexec-tools-2.0.3-disable-kexec-test.patch +Patch602: kexec-tools-2.0.15-makedumpfile-take-care-of-init-level4-pgt-rename-in-kernel.patch %description @@ -109,6 +110,7 @@ tar -z -x -v -f %{SOURCE19} tar -z -x -v -f %{SOURCE23} %patch601 -p1 +%patch602 -p1 %ifarch ppc %define archdef ARCH=ppc @@ -313,6 +315,9 @@ done %doc %changelog +* Mon Aug 7 2017 Dave Young - 2.0.15-9 +- fix makedumpfile bug 1474706 + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.15-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild