From ec2ed4c0cb068ec983657bc60a3ad55d80522995 Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Fri, 7 Jul 2006 12:31:27 -0400 Subject: [PATCH] --- yaml --- r: 32157 b: refs/heads/master c: a496e25dfb25493a57bcee5d66875d6ff80a9093 h: refs/heads/master i: 32155: b1a9ea4a13456d32dadbb9036fcd5b45319715b1 v: v3 --- [refs] | 2 +- trunk/drivers/cpufreq/cpufreq.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c59ba814509f..f6b5de953c01 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e +refs/heads/master: a496e25dfb25493a57bcee5d66875d6ff80a9093 diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c index 1ba4039777e8..8d328186f774 100644 --- a/trunk/drivers/cpufreq/cpufreq.c +++ b/trunk/drivers/cpufreq/cpufreq.c @@ -423,6 +423,8 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy, if (cpufreq_parse_governor(str_governor, &new_policy.policy, &new_policy.governor)) return -EINVAL; + lock_cpu_hotplug(); + /* Do not use cpufreq_set_policy here or the user_policy.max will be wrongly overridden */ mutex_lock(&policy->lock); @@ -432,6 +434,8 @@ static ssize_t store_scaling_governor (struct cpufreq_policy * policy, policy->user_policy.governor = policy->governor; mutex_unlock(&policy->lock); + unlock_cpu_hotplug(); + return ret ? ret : count; }