From 577854dd62a6b22aa2c0dce59f0541ac1c0c7ab5 Mon Sep 17 00:00:00 2001 From: Mikhail Zaslonko Date: Tue, 7 Jan 2020 13:38:14 +0100 Subject: [PATCH 3/3] [PATCH] s390: Use get_kaslr_offset_general() for s390x Since kernel v5.2 KASLR is supported on s390. Use recently introduced get_kaslr_offset_general() for s390x in order to derive kaslr offset from vmcoreinfo when -x makedumpfile option specified. Signed-off-by: Mikhail Zaslonko --- makedumpfile.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makedumpfile-1.6.6/makedumpfile.h b/makedumpfile-1.6.6/makedumpfile.h index 067fa483aa01..e6c815da6775 100644 --- a/makedumpfile-1.6.6/makedumpfile.h +++ b/makedumpfile-1.6.6/makedumpfile.h @@ -1075,7 +1075,7 @@ int is_iomem_phys_addr_s390x(unsigned long addr); #define get_phys_base() stub_true() #define get_machdep_info() get_machdep_info_s390x() #define get_versiondep_info() stub_true() -#define get_kaslr_offset(X) stub_false() +#define get_kaslr_offset(X) get_kaslr_offset_general(X) #define vaddr_to_paddr(X) vaddr_to_paddr_s390x(X) #define paddr_to_vaddr(X) paddr_to_vaddr_general(X) #define is_phys_addr(X) is_iomem_phys_addr_s390x(X) -- 2.17.1