From 98d28766d006d9faed1eed6457af9e23a6a1fa6c Mon Sep 17 00:00:00 2001
From: Jocelyn Falempe <jocelyn.falempe@motorola.com>
Date: Thu, 11 Mar 2010 14:01:11 -0800
Subject: [PATCH] --- yaml --- r: 202527 b: refs/heads/master c:
 a665df9d510bfd5bac5664f436411f921471264a h: refs/heads/master i:   202525:
 ff99abed0f90845700bcf6999fdd045249fc757f   202523:
 84ef834c6caebdf8edb2df48dc9b1672f0cc9089   202519:
 b62cd6e0c2968421ac2f6c969fd123efd51f67f6   202511:
 5f9bd8e0f693439bcc438ba9d514181b220bc8f1   202495:
 f7e0dc1fbb3886ae6c56738a3673f6c28ccc41bb v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/cpufreq/cpufreq_ondemand.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 321aee7bd064..f997201ba0ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 226528c6100e4191842e61997110c8ace40605f7
+refs/heads/master: a665df9d510bfd5bac5664f436411f921471264a
diff --git a/trunk/drivers/cpufreq/cpufreq_ondemand.c b/trunk/drivers/cpufreq/cpufreq_ondemand.c
index fecfcdda6ddd..7b5093664e49 100644
--- a/trunk/drivers/cpufreq/cpufreq_ondemand.c
+++ b/trunk/drivers/cpufreq/cpufreq_ondemand.c
@@ -609,7 +609,9 @@ static void do_dbs_timer(struct work_struct *work)
 	/* We want all CPUs to do sampling nearly on same jiffy */
 	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
 
-	delay -= jiffies % delay;
+	if (num_online_cpus() > 1)
+		delay -= jiffies % delay;
+
 	mutex_lock(&dbs_info->timer_mutex);
 
 	/* Common NORMAL_SAMPLE setup */
@@ -634,7 +636,9 @@ static inline void dbs_timer_init(struct cpu_dbs_info_s *dbs_info)
 {
 	/* We want all CPUs to do sampling nearly on same jiffy */
 	int delay = usecs_to_jiffies(dbs_tuners_ins.sampling_rate);
-	delay -= jiffies % delay;
+
+	if (num_online_cpus() > 1)
+		delay -= jiffies % delay;
 
 	dbs_info->sample_type = DBS_NORMAL_SAMPLE;
 	INIT_DELAYED_WORK_DEFERRABLE(&dbs_info->work, do_dbs_timer);