From 7bd5a3d5c1f774c266480abc1531eb91675b2a8b Mon Sep 17 00:00:00 2001 From: Jone Chou Date: Thu, 31 Oct 2024 02:54:40 +0800 Subject: [PATCH] ANDROID: debug_kinfo: add _text Also remove `kallsyms_addresses' related changes due to the commit 64e166099b69 ("kallsyms: get rid of code for absolute kallsyms") has removed it. Bug: 375590296 Bug: 376357855 Bug: 376487856 Signed-off-by: Jone Chou (cherry picked from https://android-review.googlesource.com/q/commit:53cf4e480b55d84d5a700ed873448391a0ae3200) Merged-In: I8b9a5a9fb3285017953af5b2826627547d0c4f56 Change-Id: I8b9a5a9fb3285017953af5b2826627547d0c4f56 --- drivers/android/debug_kinfo.c | 2 +- drivers/android/debug_kinfo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/android/debug_kinfo.c b/drivers/android/debug_kinfo.c index 090b672f8179..5039320a1607 100644 --- a/drivers/android/debug_kinfo.c +++ b/drivers/android/debug_kinfo.c @@ -20,7 +20,6 @@ * These will be re-linked against their real values * during the second link stage. */ -extern const unsigned long kallsyms_addresses[] __weak; extern const int kallsyms_offsets[] __weak; extern const u8 kallsyms_names[] __weak; extern const u8 kallsyms_seqs_of_names[] __weak; @@ -143,6 +142,7 @@ static int debug_kinfo_probe(struct platform_device *pdev) info->symbol_len = KSYM_SYMBOL_LEN; info->_relative_pa = (u64)__pa_symbol((volatile void *)kallsyms_relative_base); info->_offsets_pa = (u64)__pa_symbol((volatile void *)kallsyms_offsets); + info->_text_pa = (u64)__pa_symbol(_text); info->_stext_pa = (u64)__pa_symbol(_stext); info->_etext_pa = (u64)__pa_symbol(_etext); info->_sinittext_pa = (u64)__pa_symbol(_sinittext); diff --git a/drivers/android/debug_kinfo.h b/drivers/android/debug_kinfo.h index 2744ad3f1b25..4b0947516610 100644 --- a/drivers/android/debug_kinfo.h +++ b/drivers/android/debug_kinfo.h @@ -28,8 +28,8 @@ struct kernel_info { __u16 bit_per_long; __u16 module_name_len; __u16 symbol_len; - __u64 _addresses_pa; __u64 _relative_pa; + __u64 _text_pa; __u64 _stext_pa; __u64 _etext_pa; __u64 _sinittext_pa;