diff --git a/include/trace/events/power.h b/include/trace/events/power.h index 877417a912aa..af5018aa9517 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h @@ -500,15 +500,6 @@ DEFINE_EVENT(dev_pm_qos_request, dev_pm_qos_remove_request, TP_ARGS(name, type, new_value) ); - -DECLARE_TRACE(sugov_util_update_tp, - TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max_cap, unsigned int flags), - TP_ARGS(cpu, util, max_cap, flags)); - -DECLARE_TRACE(sugov_next_freq_tp, - TP_PROTO(unsigned int cpu, unsigned long util, unsigned long max, unsigned int freq), - TP_ARGS(cpu, util, max, freq)); - #endif /* _TRACE_POWER_H */ /* This part must be outside protection */ diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index a3067d7832f2..caa526ba16ea 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -171,8 +171,6 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy, else freq = map_util_freq(util, freq, max); - trace_sugov_next_freq_tp(policy->cpu, util, max, freq); - if (freq == sg_policy->cached_raw_freq && !sg_policy->need_freq_update) return sg_policy->next_freq; @@ -464,9 +462,6 @@ static void sugov_update_single(struct update_util_data *hook, u64 time, util = sugov_get_util(sg_cpu); max = sg_cpu->max; - - trace_sugov_util_update_tp(sg_cpu->cpu, util, max, flags); - util = sugov_iowait_apply(sg_cpu, time, util, max); next_f = get_next_freq(sg_policy, util, max); /* @@ -523,7 +518,6 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags) { struct sugov_cpu *sg_cpu = container_of(hook, struct sugov_cpu, update_util); struct sugov_policy *sg_policy = sg_cpu->sg_policy; - unsigned long util = sugov_get_util(sg_cpu); unsigned int next_f; raw_spin_lock(&sg_policy->update_lock); @@ -533,8 +527,6 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags) ignore_dl_rate_limit(sg_cpu, sg_policy); - trace_sugov_util_update_tp(sg_cpu->cpu, util, sg_cpu->max, flags); - if (sugov_should_update_freq(sg_policy, time)) { next_f = sugov_next_freq_shared(sg_cpu, time); diff --git a/kernel/trace/power-traces.c b/kernel/trace/power-traces.c index 659222d08f6f..3ca551c11ae1 100644 --- a/kernel/trace/power-traces.c +++ b/kernel/trace/power-traces.c @@ -21,5 +21,3 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(powernv_throttle); EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_start); EXPORT_TRACEPOINT_SYMBOL_GPL(device_pm_callback_end); EXPORT_TRACEPOINT_SYMBOL_GPL(clock_set_rate); -EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_next_freq_tp); -EXPORT_TRACEPOINT_SYMBOL_GPL(sugov_util_update_tp);