|
 |
17cf87 |
commit 1c45cea02df7f947b4296c1dcaefa1024235ef10
|
|
|
17cf87 |
Author: Bhupesh Sharma <bhsharma@redhat.com>
|
|
|
17cf87 |
Date: Tue Jul 14 01:14:49 2020 +0530
|
|
|
17cf87 |
|
|
|
17cf87 |
arm64: Change tcr_el1_t1sz variable name to TCR_EL1_T1SZ
|
|
|
17cf87 |
|
|
|
17cf87 |
Since linux kernel commit bbdbc11804ff ("arm64/crash_core: Export
|
|
|
17cf87 |
TCR_EL1.T1SZ in vmcoreinfo") [available in linux-next now], the name
|
|
|
17cf87 |
of tcr_el1_t1sz vmcoreinfo variable has been changed to TCR_EL1_T1SZ.
|
|
|
17cf87 |
|
|
|
17cf87 |
Make a similar change in crash-utility.
|
|
|
17cf87 |
|
|
|
17cf87 |
Signed-off-by: Bhupesh Sharma <bhsharma@redhat.com>
|
|
|
17cf87 |
|
|
|
17cf87 |
diff --git a/arm64.c b/arm64.c
|
|
|
17cf87 |
index 653225cd8cd6..fdf77bd5e0c1 100644
|
|
|
17cf87 |
--- a/arm64.c
|
|
|
17cf87 |
+++ b/arm64.c
|
|
|
17cf87 |
@@ -3922,7 +3922,7 @@ arm64_calc_VA_BITS(void)
|
|
|
17cf87 |
} else if (ACTIVE())
|
|
|
17cf87 |
error(FATAL, "cannot determine VA_BITS_ACTUAL: please use /proc/kcore\n");
|
|
|
17cf87 |
else {
|
|
|
17cf87 |
- if ((string = pc->read_vmcoreinfo("NUMBER(tcr_el1_t1sz)"))) {
|
|
|
17cf87 |
+ if ((string = pc->read_vmcoreinfo("NUMBER(TCR_EL1_T1SZ)"))) {
|
|
|
17cf87 |
/* See ARMv8 ARM for the description of
|
|
|
17cf87 |
* TCR_EL1.T1SZ and how it can be used
|
|
|
17cf87 |
* to calculate the vabits_actual
|
|
|
17cf87 |
diff --git a/netdump.c b/netdump.c
|
|
|
17cf87 |
index 406416af36bf..0054d6ab35b4 100644
|
|
|
17cf87 |
--- a/netdump.c
|
|
|
17cf87 |
+++ b/netdump.c
|
|
|
17cf87 |
@@ -1887,7 +1887,7 @@ vmcoreinfo_read_string(const char *key)
|
|
|
17cf87 |
sprintf(value, "%ld", nd->arch_data2 & 0xffffffff);
|
|
|
17cf87 |
return value;
|
|
|
17cf87 |
}
|
|
|
17cf87 |
- if (STREQ(key, "NUMBER(tcr_el1_t1sz)") && nd->arch_data2) {
|
|
|
17cf87 |
+ if (STREQ(key, "NUMBER(TCR_EL1_T1SZ)") && nd->arch_data2) {
|
|
|
17cf87 |
value = calloc(VADDR_PRLEN+1, sizeof(char));
|
|
|
17cf87 |
sprintf(value, "%lld", ((ulonglong)nd->arch_data2 >> 32) & 0xffffffff);
|
|
|
17cf87 |
pc->read_vmcoreinfo = no_vmcoreinfo;
|