From 196f1975a88251ac5de1b2fbdd1699d835cdbef9 Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Wed, 2 Jun 2021 13:55:29 -0700 Subject: [PATCH] ANDROID: sched: Gate sched_stat tracepoint exports on CONFIG_SCHEDSTATS When CONFIG_SCHEDSTATS is not set, the build breaks because DEFINE_EVENT_SCHEDSTAT evaluates to DEFINE_EVENT_NOP, which only defines trace_, not __tracepoint_, __traceiter_, and _SCK__tp_func_ like DEFINE_EVENT. Gate these exports on CONFIG_SCHEDSTATS so all of the exported symbols are defined. Change-Id: I38056ee1446e6c149686ce1905c2ba6e4ea5e59e Fixes: a6bb1af39d11 ("ANDROID: vendor_hooks: Export the tracepoints sched_stat_iowait, sched_stat_blocked, sched_stat_wait to let modules probe them") Link: https://github.com/ClangBuiltLinux/continuous-integration2/runs/2724257445?check_suite_focus=true Signed-off-by: Nathan Chancellor --- kernel/sched/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 9a9110c79bca..2c607f0c8b8d 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -45,9 +45,11 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_switch); +#ifdef CONFIG_SCHEDSTATS EXPORT_TRACEPOINT_SYMBOL_GPL(sched_stat_wait); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_stat_iowait); EXPORT_TRACEPOINT_SYMBOL_GPL(sched_stat_blocked); +#endif DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); EXPORT_SYMBOL_GPL(runqueues);