From 0a24affb869a38e7a478c834216299a358912609 Mon Sep 17 00:00:00 2001 From: xieliujie Date: Fri, 2 Jul 2021 00:06:46 +0800 Subject: [PATCH] ANDROID: vendor_hooks: modify the function name int the commit: https://android-review.googlesource.com/c/kernel/common/+/1699406/ When we build our vendor driver, report two errors: 1) Symbol too long "trace_android_vh_get_unmapped_area_from_anti_fragment_pool" 2) Symbol too long "trace_android_vh_get_unmapped_area_include_reserved_zone" So, I shorten the function names: android_vh_get_unmapped_area_from_anti_fragment_pool --> android_vh_get_from_fragment_pool android_vh_get_unmapped_area_include_reserved_zone --> android_vh_include_reserved_zone Bug: 191439466 Signed-off-by: xieliujie Change-Id: Icee4faa24df4fe1fc29434cd205c4dea82b4fba5 --- drivers/android/vendor_hooks.c | 4 ++-- include/trace/hooks/mm.h | 4 ++-- mm/mmap.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 0abcc76269c3..0c324054c782 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -245,9 +245,9 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_module_permit_after_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_util_est_update); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_meminfo_proc_show); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_mm); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_unmapped_area_from_anti_fragment_pool); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_from_fragment_pool); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exclude_reserved_zone); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_get_unmapped_area_include_reserved_zone); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_include_reserved_zone); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_alloc_pages_slowpath); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_show_mem); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_print_slabinfo_header); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index 593a686fc5b5..d58e0a59a882 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -54,14 +54,14 @@ DECLARE_HOOK(android_vh_meminfo_proc_show, DECLARE_HOOK(android_vh_exit_mm, TP_PROTO(struct mm_struct *mm), TP_ARGS(mm)); -DECLARE_HOOK(android_vh_get_unmapped_area_from_anti_fragment_pool, +DECLARE_HOOK(android_vh_get_from_fragment_pool, TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info, unsigned long *addr), TP_ARGS(mm, info, addr)); DECLARE_HOOK(android_vh_exclude_reserved_zone, TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info), TP_ARGS(mm, info)); -DECLARE_HOOK(android_vh_get_unmapped_area_include_reserved_zone, +DECLARE_HOOK(android_vh_include_reserved_zone, TP_PROTO(struct mm_struct *mm, struct vm_unmapped_area_info *info, unsigned long *addr), TP_ARGS(mm, info, addr)); diff --git a/mm/mmap.c b/mm/mmap.c index fbebd65565ce..46a0204ca205 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2101,7 +2101,7 @@ static unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info) if (length < info->length) return -ENOMEM; - trace_android_vh_get_unmapped_area_from_anti_fragment_pool(mm, info, &addr); + trace_android_vh_get_from_fragment_pool(mm, info, &addr); if (addr) return addr; @@ -2324,7 +2324,7 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, addr = vm_unmapped_area(&info); } - trace_android_vh_get_unmapped_area_include_reserved_zone(mm, &info, &addr); + trace_android_vh_include_reserved_zone(mm, &info, &addr); return addr; }