From 30d5278a75033a0405c48db911026b68cbf5e4cf Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Sat, 22 Jan 2022 17:58:39 +0800 Subject: [PATCH] ANDROID: vendor_hooks: fix __section macro aosp inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4RCS8 CVE: NA Reference: https://android.googlesource.com/kernel/common/+/4cc2f83c77aa --------------------------- After upstream 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")"), the preprocessor macro __section now requires the section name to be double quoted. This patch resolves breakage that results from merging down from mainline in this out of tree header. Fixes: 33def8498fdd ("treewide: Convert macro and uses of __section(foo) to __section("foo")") Signed-off-by: Nick Desaulniers Signed-off-by: Greg Kroah-Hartman Change-Id: Ie6a701251e6420e63187a466b43ec2c834e0ec2e Signed-off-by: Jialin Zhang Reviewed-by: Wei Li Reviewed-by: Xie XiuQi Signed-off-by: Zheng Zengkai --- include/trace/hooks/vendor_hooks.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h index 8a7acb983c67..e6cabd366eeb 100644 --- a/include/trace/hooks/vendor_hooks.h +++ b/include/trace/hooks/vendor_hooks.h @@ -15,11 +15,11 @@ #define DEFINE_HOOK_FN(_name, _reg, _unreg, proto, args) \ static const char __tpstrtab_##_name[] \ - __section(__tracepoints_strings) = #_name; \ + __section("__tracepoints_strings") = #_name; \ extern struct static_call_key STATIC_CALL_KEY(tp_func_##_name); \ int __traceiter_##_name(void *__data, proto); \ struct tracepoint __tracepoint_##_name __used \ - __section(__tracepoints) = { \ + __section("__tracepoints") = { \ .name = __tpstrtab_##_name, \ .key = STATIC_KEY_INIT_FALSE, \ .static_call_key = &STATIC_CALL_KEY(tp_func_##_name), \ -- GitLab