2 files changed, 7 insertions, 1 deletions

diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index 8d053f500fc2..8532bb79e5fc 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -470,7 +470,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
         dbs_info->enable = 1;
         ondemand_powersave_bias_init();
         dbs_info->sample_type = DBS_NORMAL_SAMPLE;
-        INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);
+        INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);
         queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
                               delay);
 }
diff --git a/include/linux/workqueue.h b/include/linux/workqueue.h
index b8abfc74d038..f16ba1e0687d 100644
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
@@ -121,6 +121,12 @@ struct execute_work {
                 init_timer(&(_work)->timer);                    \
         } while (0)
 
+#define INIT_DELAYED_WORK_DEFERRABLE(_work, _func)                      \
+        do {                                                    \
+                INIT_WORK(&(_work)->work, (_func));             \
+                init_timer_deferrable(&(_work)->timer);         \
+        } while (0)
+
 /**
  * work_pending - Find out whether a work item is currently pending
  * @work: The work item in question