Revert "cpufreq: schedutil: irq-work and mutex are only used in slow path"

This reverts commit 21ef57297b15a49b0c4dd4e7135c1a08e9a29a1c.

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index 4cf443271567dd9adb3f9e851694d24adc0f0518..c406687ebfdaae8094f1852aea76ba5542ece4a4 100644 (file)
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -592,12 +592,15 @@ static struct sugov_policy *sugov_policy_alloc(struct cpufreq_policy *policy)
                return NULL;
 
        sg_policy->policy = policy;
+       init_irq_work(&sg_policy->irq_work, sugov_irq_work);
+       mutex_init(&sg_policy->work_lock);
        raw_spin_lock_init(&sg_policy->update_lock);
        return sg_policy;
 }
 
 static void sugov_policy_free(struct sugov_policy *sg_policy)
 {
+       mutex_destroy(&sg_policy->work_lock);
        kfree(sg_policy);
 }
 
@@ -631,9 +634,6 @@ static int sugov_kthread_create(struct sugov_policy *sg_policy)
 
        sg_policy->thread = thread;
        kthread_bind_mask(thread, policy->related_cpus);
-       init_irq_work(&sg_policy->irq_work, sugov_irq_work);
-       mutex_init(&sg_policy->work_lock);
-
        wake_up_process(thread);
 
        return 0;
@@ -647,7 +647,6 @@ static void sugov_kthread_stop(struct sugov_policy *sg_policy)
 
        kthread_flush_worker(&sg_policy->worker);
        kthread_stop(sg_policy->thread);
-       mutex_destroy(&sg_policy->work_lock);
 }
 
 static struct sugov_tunables *sugov_tunables_alloc(struct sugov_policy *sg_policy)
@@ -814,10 +813,8 @@ static void sugov_stop(struct cpufreq_policy *policy)
 
        synchronize_sched();
 
-       if (!policy->fast_switch_enabled) {
-               irq_work_sync(&sg_policy->irq_work);
-               kthread_cancel_work_sync(&sg_policy->work);
-       }
+       irq_work_sync(&sg_policy->irq_work);
+       kthread_cancel_work_sync(&sg_policy->work);
 }
 
 static void sugov_limits(struct cpufreq_policy *policy)