From f59d01506d405b48178dbbf76aa4ee8b5b1499ca Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Tue, 31 May 2005 19:03:49 -0700
Subject: [PATCH] --- yaml --- r: 1743 b: refs/heads/master c:
 790d76fa979f55bfc49a6901bb911778949b582d h: refs/heads/master i:   1741:
 051d11632283d8cce874367b7c7749acd184c09f   1739:
 b716a6ced2bedbf5124f421ab081af25ec6c9394   1735:
 cd2047fb9a487a1a5db890e42aecc10fb3cf0cc3   1727:
 b1ba0d30c45650f009ffa80557adc7a5df4a986f v: v3

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

diff --git a/[refs] b/[refs]
index d88eb103b66e..e5359371b17e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dac1c1a56279b4545a822ec7bc770003c233e546
+refs/heads/master: 790d76fa979f55bfc49a6901bb911778949b582d
diff --git a/trunk/drivers/cpufreq/cpufreq_conservative.c b/trunk/drivers/cpufreq/cpufreq_conservative.c
index 3082a3fa5ec4..c503ec14765f 100644
--- a/trunk/drivers/cpufreq/cpufreq_conservative.c
+++ b/trunk/drivers/cpufreq/cpufreq_conservative.c
@@ -369,7 +369,13 @@ static void dbs_check_cpu(int cpu)
 
 	if (idle_ticks < up_idle_ticks) {
 		down_skip[cpu] = 0;
-		this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
+		for_each_cpu_mask(j, policy->cpus) {
+			struct cpu_dbs_info_s *j_dbs_info;
+
+			j_dbs_info = &per_cpu(cpu_dbs_info, j);
+			j_dbs_info->prev_cpu_idle_down = 
+					j_dbs_info->prev_cpu_idle_up;
+		}
 		/* if we are already at full speed then break out early */
 		if (requested_freq[cpu] == policy->max)
 			return;
diff --git a/trunk/drivers/cpufreq/cpufreq_ondemand.c b/trunk/drivers/cpufreq/cpufreq_ondemand.c
index 26cf54b11ba6..f239545ac1b8 100644
--- a/trunk/drivers/cpufreq/cpufreq_ondemand.c
+++ b/trunk/drivers/cpufreq/cpufreq_ondemand.c
@@ -355,7 +355,13 @@ static void dbs_check_cpu(int cpu)
 
 	if (idle_ticks < up_idle_ticks) {
 		down_skip[cpu] = 0;
-		this_dbs_info->prev_cpu_idle_down = total_idle_ticks;
+		for_each_cpu_mask(j, policy->cpus) {
+			struct cpu_dbs_info_s *j_dbs_info;
+
+			j_dbs_info = &per_cpu(cpu_dbs_info, j);
+			j_dbs_info->prev_cpu_idle_down = 
+					j_dbs_info->prev_cpu_idle_up;
+		}
 		/* if we are already at full speed then break out early */
 		if (policy->cur == policy->max)
 			return;