From b69ffb4c7e64f829bba21ab66a1fd6cc6d4f44ed Mon Sep 17 00:00:00 2001
From: Andrea Righi <righi.andrea@gmail.com>
Date: Thu, 18 Sep 2008 10:43:40 +0000
Subject: [PATCH] --- yaml --- r: 110802 b: refs/heads/master c:
 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 5b4adc70c5b1..3eca93fbb136 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4d14bc0bb5d13e316890651ae4518b764c3344c
+refs/heads/master: 4f6e6b9f97b0ce98a8d1da65adbaf743bd0486a9
diff --git a/trunk/drivers/cpufreq/cpufreq_ondemand.c b/trunk/drivers/cpufreq/cpufreq_ondemand.c
index bd069349bcae..2ab3c12b88af 100644
--- a/trunk/drivers/cpufreq/cpufreq_ondemand.c
+++ b/trunk/drivers/cpufreq/cpufreq_ondemand.c
@@ -640,8 +640,11 @@ static int __init cpufreq_gov_dbs_init(void)
 {
 	int err;
 	cputime64_t wall;
-	u64 idle_time = get_cpu_idle_time_us(smp_processor_id(), &wall);
+	u64 idle_time;
+	int cpu = get_cpu();
 
+	idle_time = get_cpu_idle_time_us(cpu, &wall);
+	put_cpu();
 	if (idle_time != -1ULL) {
 		/* Idle micro accounting is supported. Use finer thresholds */
 		dbs_tuners_ins.up_threshold = MICRO_FREQUENCY_UP_THRESHOLD;