aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2007-02-18 16:44:07 -0500
committerDave Jones <davej@redhat.com>2007-02-20 14:23:43 -0500
commit48ac3271e52d23ee987da93f80d20f6bec8e6717 (patch)
tree772efa621ceb4814ad296f5dd09fc46a320fcfa4
parentb077ffb3b767c3efb44d00b998385a9cb127255c (diff)
[CPUFREQ] cpufreq_ondemand.c: don't use _WORK_NAR
Looks like dbs_timer() is very careful wrt per_cpu(cpu_dbs_info), and it doesn't need the help of WORK_STRUCT_NOAUTOREL. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Acked-By: David Howells <dhowells@redhat.com> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--drivers/cpufreq/cpufreq_ondemand.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
index d60bcb9d14cc..8d053f500fc2 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}