aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 15:09:20 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-31 15:09:20 -0800
commit28e0cf22c1221650b4bfba48808d966160c42320 (patch)
tree79e530ac09f62000c1d0ec998a1bfa5404a2577a /include/linux
parent9aef3b7c208b216b54a2e6614c6287ca8a09cf6f (diff)
parentc0672860199ac009af7cf198a134ee7a4c3a9bb3 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/cpufreq.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index c31650df924..17866d7e2b7 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -14,6 +14,7 @@
#ifndef _LINUX_CPUFREQ_H
#define _LINUX_CPUFREQ_H
+#include <linux/mutex.h>
#include <linux/config.h>
#include <linux/notifier.h>
#include <linux/threads.h>
@@ -82,7 +83,7 @@ struct cpufreq_policy {
unsigned int policy; /* see above */
struct cpufreq_governor *governor; /* see below */
- struct semaphore lock; /* CPU ->setpolicy or ->target may
+ struct mutex lock; /* CPU ->setpolicy or ->target may
only be called once a time */
struct work_struct update; /* if update_policy() needs to be