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

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1269952728 -3600
# Node ID 7cf2c9797330286206c3d37e8b8c1705978b269e
# Parent  106fb323c803537762ad436991fb82aabfa2ca73
cpufreq: don't re-init active dbs timer in S3 or cpu online

Signed-off-by: Wei Gang <gang.wei@xxxxxxxxx>
xen-unstable changeset:   21073:d9ef749ea56d
xen-unstable date:        Fri Mar 26 10:28:37 2010 +0000
---
 xen/drivers/cpufreq/cpufreq_ondemand.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 106fb323c803 -r 7cf2c9797330 xen/drivers/cpufreq/cpufreq_ondemand.c
--- a/xen/drivers/cpufreq/cpufreq_ondemand.c    Tue Mar 30 13:38:16 2010 +0100
+++ b/xen/drivers/cpufreq/cpufreq_ondemand.c    Tue Mar 30 13:38:48 2010 +0100
@@ -187,8 +187,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