[PATCH 1/2] Add a new helper arm64_get_pkd

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Use this new helper to get the pkd which
may be used in future.

Also move struct proc_kcore_data to defs.h to
avoid the compiler errors.

Signed-off-by: Huang Shijie <shijie@xxxxxxxxxxxxxxxxxxxxxx>
---
 defs.h    | 16 ++++++++++++++++
 netdump.c |  5 +++++
 netdump.h | 12 ------------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/defs.h b/defs.h
index 81ac049..4f06bdf 100644
--- a/defs.h
+++ b/defs.h
@@ -39,6 +39,7 @@
 #include <signal.h>
 #include <assert.h>
 #include <errno.h>
+#include <elf.h>
 #include <dirent.h>
 #include <time.h>
 #include <zlib.h>
@@ -6647,6 +6648,20 @@ int sparc64_vmalloc_addr(ulong);
 /*
  *  netdump.c 
  */
+
+struct proc_kcore_data {
+	uint flags;
+	uint segments;
+	char *elf_header;
+	size_t header_size;
+	Elf64_Phdr *load64;
+	Elf64_Phdr *notes64;
+	Elf32_Phdr *load32;
+	Elf32_Phdr *notes32;
+	void *vmcoreinfo;
+	uint size_vmcoreinfo;
+};
+
 int is_netdump(char *, ulong);
 uint netdump_page_size(void);
 int read_netdump(int, void *, int, ulong, physaddr_t);
@@ -6689,6 +6704,7 @@ int kdump_phys_base(ulong *);
 int kdump_set_phys_base(ulong);
 int arm_kdump_phys_base(ulong *);
 int arm_kdump_phys_end(ulong *);
+struct proc_kcore_data *arm64_get_pkd(void);
 int is_proc_kcore(char *, ulong);
 int proc_kcore_init(FILE *, int);
 int read_proc_kcore(int, void *, int, ulong, physaddr_t);
diff --git a/netdump.c b/netdump.c
index ff273b4..3066c80 100644
--- a/netdump.c
+++ b/netdump.c
@@ -3864,6 +3864,11 @@ get_netdump_regs_arm64(struct bt_info *bt, ulong *eip, ulong *esp)
 	machdep->get_stack_frame(bt, eip, esp);
 }
 
+struct proc_kcore_data *arm64_get_pkd(void)
+{
+	return pkd;
+}
+
 static void
 get_netdump_regs_mips(struct bt_info *bt, ulong *eip, ulong *esp)
 {
diff --git a/netdump.h b/netdump.h
index ffd60b8..119cb72 100644
--- a/netdump.h
+++ b/netdump.h
@@ -148,15 +148,3 @@ struct vmcore_data {
 
 #define MAX_KCORE_ELF_HEADER_SIZE (32768)
 
-struct proc_kcore_data {
-	uint flags;
-	uint segments;
-	char *elf_header;
-	size_t header_size;
-	Elf64_Phdr *load64;
-	Elf64_Phdr *notes64;
-	Elf32_Phdr *load32;
-	Elf32_Phdr *notes32;
-	void *vmcoreinfo;
-	uint size_vmcoreinfo;
-};
-- 
2.30.2

--
Crash-utility mailing list
Crash-utility@xxxxxxxxxx
https://listman.redhat.com/mailman/listinfo/crash-utility
Contribution Guidelines: https://github.com/crash-utility/crash/wiki




[Index of Archives]     [Fedora Development]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]     [Fedora Tools]

 

Powered by Linux