1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
index 0e5929b36276..0806c31e5764 100644
--- a/drivers/cpufreq/cpufreq_governor.c
+++ b/drivers/cpufreq/cpufreq_governor.c
@@ -123,7 +123,14 @@ void gov_queue_work(struct dbs_data *dbs_data, struct cpufreq_policy *policy,
                 return;
 
         if (!all_cpus) {
-                __gov_queue_work(smp_processor_id(), dbs_data, delay);
+                /*
+                 * Use raw_smp_processor_id() to avoid preemptible warnings.
+                 * We know that this is only called with all_cpus == false from
+                 * works that have been queued with *_work_on() functions and
+                 * those works are canceled during CPU_DOWN_PREPARE so they
+                 * can't possibly run on any other CPU.
+                 */
+                __gov_queue_work(raw_smp_processor_id(), dbs_data, delay);
         } else {
                 for_each_cpu(i, policy->cpus)
                         __gov_queue_work(i, dbs_data, delay);