[Xen-changelog] [xen-unstable] cpufreq: don't re-init active dbs timer in S3 or cpu online

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269599317 0
# Node ID d9ef749ea56d979b6e58047864d5eb20895f26c4
# Parent  cea44a143c8d5dd25e05aaef3c2fe3210952046a
cpufreq: don't re-init active dbs timer in S3 or cpu online

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>
---
 xen/drivers/cpufreq/cpufreq_ondemand.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r cea44a143c8d -r d9ef749ea56d xen/drivers/cpufreq/cpufreq_ondemand.c
--- a/xen/drivers/cpufreq/cpufreq_ondemand.c    Fri Mar 26 08:50:11 2010 +0000
+++ b/xen/drivers/cpufreq/cpufreq_ondemand.c    Fri Mar 26 10:28:37 2010 +0000
@@ -196,8 +196,9 @@ static void dbs_timer_init(struct cpu_db
 {
     dbs_info->enable = 1;
 
-    init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
-        (void *)dbs_info, dbs_info->cpu);
+    if ( !dbs_timer[dbs_info->cpu].function )
+        init_timer(&dbs_timer[dbs_info->cpu], do_dbs_timer, 
+            (void *)dbs_info, dbs_info->cpu);
 
     set_timer(&dbs_timer[dbs_info->cpu], NOW()+dbs_tuners_ins.sampling_rate);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog