From b8d72cb07e32f7d26a0beec71336403cb0a475fb Mon Sep 17 00:00:00 2001 From: Kuan-Ying Lee Date: Thu, 28 Dec 2023 17:21:25 +0800 Subject: [PATCH] ANDROID: debug_kinfo: fix build issue due to module_alloc_base change In commit 3e35d303ab7d ("arm64: module: rework module VA range selection"), the module_alloc_base variable is changed to static module_direct_base and module_plt_base. Remove those fiedls from debug_kinfo structure to fix build error. common/drivers/android/debug_kinfo.c:165:26: error: use of undeclared identifier 'module_alloc_base' info->module_start_va = module_alloc_base; ^ Bug: 317938461 Change-Id: I817d5a30ed3e6be3b1e4998541d4a46a4bbd7dd4 Signed-off-by: Kuan-Ying Lee --- drivers/android/debug_kinfo.c | 11 +---------- drivers/android/debug_kinfo.h | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/android/debug_kinfo.c b/drivers/android/debug_kinfo.c index 93a5ecb89bc4..b1359154c396 100644 --- a/drivers/android/debug_kinfo.c +++ b/drivers/android/debug_kinfo.c @@ -161,16 +161,7 @@ static int debug_kinfo_probe(struct platform_device *pdev) strlcpy(info->last_uts_release, init_utsname()->release, sizeof(info->last_uts_release)); info->enabled_modules_tree_lookup = IS_ENABLED(CONFIG_MODULES_TREE_LOOKUP); info->mod_kallsyms_offset = offsetof(struct module, kallsyms); -#if defined(CONFIG_RANDOMIZE_BASE) && defined(MODULES_VSIZE) - info->module_start_va = module_alloc_base; - info->module_end_va = info->module_start_va + MODULES_VSIZE; -#elif defined(CONFIG_MODULES) && defined(MODULES_VADDR) - info->module_start_va = MODULES_VADDR; - info->module_end_va = MODULES_END; -#else - info->module_start_va = VMALLOC_START; - info->module_end_va = VMALLOC_END; -#endif + update_kernel_all_info(all_info); return 0; diff --git a/drivers/android/debug_kinfo.h b/drivers/android/debug_kinfo.h index 3c7c4a21d5d5..77f30ae5eb31 100644 --- a/drivers/android/debug_kinfo.h +++ b/drivers/android/debug_kinfo.h @@ -56,8 +56,6 @@ struct kernel_info { /* For module kallsyms */ __u32 enabled_modules_tree_lookup; __u32 mod_kallsyms_offset; - __u64 module_start_va; - __u64 module_end_va; } __packed; struct kernel_all_info {