Merge ~joalif/ubuntu/+source/crash:lp1919275-focal into ubuntu/+source/crash:ubuntu/focal-devel

[Ioanna Alifieraki]

This is an MR to address lp #1919275 on focal.
Consists of 2 commits, the first is the actual patch in the form of quilt patch,
the second is the changelog update.

Unmerged commits

421b588... by Ioanna Alifieraki on 2021-04-15

Update changelog

9ba526b... by Ioanna Alifieraki on 2021-04-15

Patch for LP #1919275

diff --git a/debian/changelog b/debian/changelog
index d49bbca..38a2a1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+crash (7.2.8-1ubuntu1.20.04.1) focal; urgency=medium
+
+  * Fix cannot determine VA_BITS_ACTUAL (LP: #1919275):
+    - d/p/0003-arm64-Change-tcr_el1_t1sz-variable-name-to-TCR_EL1_T.patch
+
+ -- Ioanna Alifieraki <[e-mail]>  Thu, 15 Apr 2021 12:33:46 +0300
+
 crash (7.2.8-1ubuntu1) focal; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff --git a/debian/patches/0003-arm64-Change-tcr_el1_t1sz-variable-name-to-TCR_EL1_T.patch b/debian/patches/0003-arm64-Change-tcr_el1_t1sz-variable-name-to-TCR_EL1_T.patch
 new file mode 100644
index 0000000..0505f75
--- /dev/null
+++ b/debian/patches/0003-arm64-Change-tcr_el1_t1sz-variable-name-to-TCR_EL1_T.patch
@@ -0,0 +1,41 @@
+From 1c45cea02df7f947b4296c1dcaefa1024235ef10 Mon Sep 17 00:00:00 2001
+From: Bhupesh Sharma <[e-mail]>
+Origin: upstream, https://github.com/crash-utility/crash/commit/1c45cea02df7f947b4296c1dcaefa1024235ef10
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1919275
+Date: Tue, 14 Jul 2020 01:14:49 +0530
+Subject: [PATCH] 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 <[e-mail]>
+---
+ arm64.c   | 2 +-
+ netdump.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arm64.c
++++ b/arm64.c
+@@ -3873,7 +3873,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
+--- 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/debian/patches/series b/debian/patches/series
index 439564c..92e7031 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-dont-git-clone-eppic-extension.patch
 0002-multiarch-libc.patch
+0003-arm64-Change-tcr_el1_t1sz-variable-name-to-TCR_EL1_T.patch