From 187306ab1aeefed96e14386365114c056da32060 Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 16 Mar 2021 09:24:09 +0000 Subject: [PATCH] ANDROID: Partial revert of 06881e01b564 ("ANDROID: sched: Add vendor hooks for override sugov behavior") Remove the set_sugov_sched_attr hook which is no longer needed with a modular governor. The IOWait hook must stay, however. Bug: 171598214 Signed-off-by: Quentin Perret Change-Id: Ie68df673bc78ca76c90ba1e6c32ecaa4bba10c89 --- drivers/android/vendor_hooks.c | 1 - include/trace/hooks/sched.h | 5 ----- kernel/sched/cpufreq_schedutil.c | 1 - 3 files changed, 7 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 8dbb543fe917..4582a613cefe 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -105,7 +105,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_busiest_queue); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_migrate_queued_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_resume_cpus); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_energy_efficient_cpu); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_sugov_sched_attr); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_iowait); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_overutilized); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_setaffinity); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index 11ba004e59f9..aed5b8f6fd0e 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -113,11 +113,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_find_energy_efficient_cpu, TP_PROTO(struct task_struct *p, int prev_cpu, int sync, int *new_cpu), TP_ARGS(p, prev_cpu, sync, new_cpu), 1); -struct sched_attr; -DECLARE_HOOK(android_vh_set_sugov_sched_attr, - TP_PROTO(struct sched_attr *attr), - TP_ARGS(attr)); - DECLARE_RESTRICTED_HOOK(android_rvh_set_iowait, TP_PROTO(struct task_struct *p, int *should_iowait_boost), TP_ARGS(p, should_iowait_boost), 1); diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 575c8bc72386..a3067d7832f2 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -676,7 +676,6 @@ static int sugov_kthread_create(struct sugov_policy *sg_policy) if (policy->fast_switch_enabled) return 0; - trace_android_vh_set_sugov_sched_attr(&attr); kthread_init_work(&sg_policy->work, sugov_work); kthread_init_worker(&sg_policy->worker); thread = kthread_create(kthread_worker_fn, &sg_policy->worker,