diff --git a/makedumpfile-arm64-VA-range-SUSE.patch b/makedumpfile-arm64-VA-range-SUSE.patch new file mode 100644 index 0000000..f64c4c6 --- /dev/null +++ b/makedumpfile-arm64-VA-range-SUSE.patch @@ -0,0 +1,24 @@ +Subject: Align PMD_SECTION_MASK with CONFIG_ARM64_VA_BITS + +References: bsc#1142715 + +Since SUSE 4.12 kernel the VA renge is increased to 48 bits. + +Upstream proposed to export the VA range in vmcoreinfo but we did not backport +the patch. + +Link: https://lists.infradead.org/pipermail/kexec/2019-November/023966.html +Link: https://patchwork.kernel.org/cover/11266557/ + +diff -ur makedumpfile-1.6.7.orig/arch/arm64.c makedumpfile-1.6.7/arch/arm64.c +--- makedumpfile-1.6.7.orig/arch/arm64.c 2020-01-15 19:09:56.000000000 +0100 ++++ makedumpfile-1.6.7/arch/arm64.c 2020-03-04 14:38:02.281783810 +0100 +@@ -81,7 +81,7 @@ + * Remove the highest order bits that are not a part of the + * physical address in a section + */ +-#define PMD_SECTION_MASK ((1UL << 40) - 1) ++#define PMD_SECTION_MASK ((1UL << 48) - 1) + + #define PMD_TYPE_MASK 3 + #define PMD_TYPE_SECT 1 diff --git a/makedumpfile.changes b/makedumpfile.changes index 12035de..9bea351 100644 --- a/makedumpfile.changes +++ b/makedumpfile.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 4 13:45:23 UTC 2020 - Michal Suchanek + +- makedumpfile-arm64-VA-range-SUSE.patch: Fix error processing core files on + arm64 (bsc#1142715). + ------------------------------------------------------------------- Wed Jan 29 11:51:27 UTC 2020 - Petr Tesařík diff --git a/makedumpfile.spec b/makedumpfile.spec index eafc47e..4a6c9ae 100644 --- a/makedumpfile.spec +++ b/makedumpfile.spec @@ -43,6 +43,7 @@ Source99: %{name}-rpmlintrc Patch1: %{name}-override-libtinfo.patch Patch2: %{name}-ppc64-VA-range-SUSE.patch Patch3: %{name}-PN_XNUM.patch +Patch4: %{name}-arm64-VA-range-SUSE.patch BuildRequires: libdw-devel BuildRequires: libelf-devel BuildRequires: libeppic-devel @@ -69,9 +70,7 @@ via gdb or crash utility. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autopatch -p1 %build export CFLAGS="%{optflags}"