aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpufreq
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 17:17:50 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-26 17:17:50 -0500
commit6f8c480f998a619082f18407f8d7f4c29e94dc6e (patch)
tree5047fe0d685fe9eab64c506fa1001e7df5e65faa /drivers/cpufreq
parent038c068f63a950c3a6ccfa814831ccac0ad48fb1 (diff)
parentbd5ab26a7d0cc834d846fe5dd7291f0aed3be72b (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
* master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] constify some data tables. [CPUFREQ] constify cpufreq_driver where possible. {rd,wr}msr_on_cpu SMP=n optimization [CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR rdmsr_on_cpu, wrmsr_on_cpu [CPUFREQ] Revert default on deprecated config X86_SPEEDSTEP_CENTRINO_ACPI
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r--drivers/cpufreq/cpufreq.c4
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index f52facc570f..a12d6a236df 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -1752,7 +1752,7 @@ static struct notifier_block __cpuinitdata cpufreq_cpu_notifier =
1752 * (and isn't unregistered in the meantime). 1752 * (and isn't unregistered in the meantime).
1753 * 1753 *
1754 */ 1754 */
1755int cpufreq_register_driver(struct cpufreq_driver *driver_data) 1755int cpufreq_register_driver(const struct cpufreq_driver *driver_data)
1756{ 1756{
1757 unsigned long flags; 1757 unsigned long flags;
1758 int ret; 1758 int ret;
@@ -1817,7 +1817,7 @@ EXPORT_SYMBOL_GPL(cpufreq_register_driver);
1817 * Returns zero if successful, and -EINVAL if the cpufreq_driver is 1817 * Returns zero if successful, and -EINVAL if the cpufreq_driver is
1818 * currently not initialised. 1818 * currently not initialised.
1819 */ 1819 */
1820int cpufreq_unregister_driver(struct cpufreq_driver *driver) 1820int cpufreq_unregister_driver(const struct cpufreq_driver *driver)
1821{ 1821{
1822 unsigned long flags; 1822 unsigned long flags;
1823 1823
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index d60bcb9d14c..8d053f500fc 100644
--- a/drivers/cpufreq/cpufreq_ondemand.c
+++ b/drivers/cpufreq/cpufreq_ondemand.c
@@ -432,9 +432,6 @@ static void do_dbs_timer(struct work_struct *work)
432 /* We want all CPUs to do sampling nearly on same jiffy */ 432 /* We want all CPUs to do sampling nearly on same jiffy */
433 int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate); 433 int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
434 434
435 /* Permit rescheduling of this work item */
436 work_release(work);
437
438 delay -= jiffies % delay; 435 delay -= jiffies % delay;
439 436
440 if (lock_policy_rwsem_write(cpu) < 0) 437 if (lock_policy_rwsem_write(cpu) < 0)
@@ -473,7 +470,7 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
473 dbs_info->enable = 1; 470 dbs_info->enable = 1;
474 ondemand_powersave_bias_init(); 471 ondemand_powersave_bias_init();
475 dbs_info->sample_type = DBS_NORMAL_SAMPLE; 472 dbs_info->sample_type = DBS_NORMAL_SAMPLE;
476 INIT_DELAYED_WORK_NAR(&dbs_info->work, do_dbs_timer); 473 INIT_DELAYED_WORK(&dbs_info->work, do_dbs_timer);
477 queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work, 474 queue_delayed_work_on(dbs_info->cpu, kondemand_wq, &dbs_info->work,
478 delay); 475 delay);
479} 476}