[PATCH 3/4] arm64: Fix KVBASE

Pratyush Anand panand at redhat.com
Sat Dec 5 08:30:02 PST 2015


KVBASE should be VMALLOC_START. So fix it.

Signed-off-by: Pratyush Anand <panand at redhat.com>
Reported-by: Sameer Goel <sgoel at codeaurora.org>
---
 arch/arm64.c   | 3 ++-
 makedumpfile.h | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64.c b/arch/arm64.c
index 4d50012529c3..a94a4ba16dd5 100644
--- a/arch/arm64.c
+++ b/arch/arm64.c
@@ -199,7 +199,8 @@ get_machdep_info_arm64(void)
 {
 	info->max_physmem_bits = PHYS_MASK_SHIFT;
 	info->section_size_bits = SECTIONS_SIZE_BITS;
-	info->page_offset = KVBASE;
+	info->page_offset = SYMBOL(_stext)
+		& (0xffffffffffffffffUL << (VA_BITS - 1));
 	info->vmalloc_start = 0xffffffffffffffffUL << VA_BITS;
 	info->vmalloc_end = PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - 0x10000;
 	info->vmemmap_start = VMALLOC_END + 0x10000;
diff --git a/makedumpfile.h b/makedumpfile.h
index abe6a9897095..c42fc8142663 100644
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -507,8 +507,7 @@ int get_va_bits_arm64(void);
 #define ARM64_PGTABLE_LEVELS	get_pgtable_level_arm64()
 #define VA_BITS			get_va_bits_arm64()
 #define PAGE_SHIFT		get_page_shift_arm64()
-#define KVBASE_MASK		(0xffffffffffffffffUL << (VA_BITS - 1))
-#define KVBASE			(SYMBOL(_stext) & KVBASE_MASK)
+#define KVBASE			VMALLOC_START
 #endif /* aarch64 */
 
 #ifdef __arm__
-- 
2.5.0




More information about the kexec mailing list