projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-merge-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
cpufreq
/
cpufreq_conservative.c
diff --git
a/drivers/cpufreq/cpufreq_conservative.c
b/drivers/cpufreq/cpufreq_conservative.c
index
b75dc2c
..
a152af7
100644
(file)
--- a/
drivers/cpufreq/cpufreq_conservative.c
+++ b/
drivers/cpufreq/cpufreq_conservative.c
@@
-466,7
+466,7
@@
static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
delay -= jiffies % delay;
dbs_info->enable = 1;
- INIT_DE
LAYED_WORK_DEFERRABLE
(&dbs_info->work, do_dbs_timer);
+ INIT_DE
FERRABLE_WORK
(&dbs_info->work, do_dbs_timer);
schedule_delayed_work_on(dbs_info->cpu, &dbs_info->work, delay);
}