diff --git a/SOURCES/github_1c45cea02df7.patch b/SOURCES/github_1c45cea02df7.patch new file mode 100644 index 0000000..e513ac9 --- /dev/null +++ b/SOURCES/github_1c45cea02df7.patch @@ -0,0 +1,40 @@ +commit 1c45cea02df7f947b4296c1dcaefa1024235ef10 +Author: Bhupesh Sharma +Date: Tue Jul 14 01:14:49 2020 +0530 + + arm64: Change tcr_el1_t1sz variable name to TCR_EL1_T1SZ + + Since linux kernel commit bbdbc11804ff ("arm64/crash_core: Export + TCR_EL1.T1SZ in vmcoreinfo") [available in linux-next now], the name + of tcr_el1_t1sz vmcoreinfo variable has been changed to TCR_EL1_T1SZ. + + Make a similar change in crash-utility. + + Signed-off-by: Bhupesh Sharma + +diff --git a/arm64.c b/arm64.c +index 653225cd8cd6..fdf77bd5e0c1 100644 +--- a/arm64.c ++++ b/arm64.c +@@ -3922,7 +3922,7 @@ arm64_calc_VA_BITS(void) + } else if (ACTIVE()) + error(FATAL, "cannot determine VA_BITS_ACTUAL: please use /proc/kcore\n"); + else { +- if ((string = pc->read_vmcoreinfo("NUMBER(tcr_el1_t1sz)"))) { ++ if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)"))) { + /* See ARMv8 ARM for the description of + * TCR_EL1.T1SZ and how it can be used + * to calculate the vabits_actual +diff --git a/netdump.c b/netdump.c +index 406416af36bf..0054d6ab35b4 100644 +--- a/netdump.c ++++ b/netdump.c +@@ -1887,7 +1887,7 @@ vmcoreinfo_read_string(const char *key) + sprintf(value, "%ld", nd->arch_data2 & 0xffffffff); + return value; + } +- if (STREQ(key, "NUMBER(tcr_el1_t1sz)") && nd->arch_data2) { ++ if (STREQ(key, "NUMBER(TCR_EL1_T1SZ)") && nd->arch_data2) { + value = calloc(VADDR_PRLEN+1, sizeof(char)); + sprintf(value, "%lld", ((ulonglong)nd->arch_data2 >> 32) & 0xffffffff); + pc->read_vmcoreinfo = no_vmcoreinfo; diff --git a/SPECS/crash.spec b/SPECS/crash.spec index e97e673..1b8612f 100644 --- a/SPECS/crash.spec +++ b/SPECS/crash.spec @@ -4,7 +4,7 @@ Summary: Kernel analysis utility for live systems, netdump, diskdump, kdump, LKCD or mcore dumpfiles Name: crash Version: 7.2.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3 Group: Development/Debuggers Source0: https://github.com/crash-utility/crash/archive/crash-%{version}.tar.gz @@ -20,6 +20,7 @@ Patch0: lzo_snappy.patch Patch1: rhel8_build.patch Patch2: github_b80b16549e24.patch Patch3: github_0f29a8ac6b73.patch +Patch4: github_1c45cea02df7.patch %description The core analysis suite is a self-contained tool that can be used to @@ -44,6 +45,7 @@ offered by Mission Critical Linux, or the LKCD kernel patch. %patch1 -p1 -b rhel8_build.patch %patch2 -p1 -b github_b80b16549e24.patch %patch3 -p1 -b github_0f29a8ac6b73.patch +%patch4 -p1 -b github_1c45cea02df7.patch %build cp %{SOURCE1} . @@ -74,6 +76,10 @@ rm -rf %{buildroot} %{_includedir}/* %changelog +* Mon Jul 27 2020 Bhupesh Sharma - 7.2.8-5 +- aarch64: Support reading extended 52-bit address space via crash-utility + Resolves: rhbz#1861086 + * Fri Jul 10 2020 Bhupesh Sharma - 7.2.8-4 - Replace people.redhat.com references with github equivalents. Resolves: rhbz#1851745