diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:09:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 00:09:20 +0100 |
| commit | 28e0cf22c1221650b4bfba48808d966160c42320 (patch) | |
| tree | 79e530ac09f62000c1d0ec998a1bfa5404a2577a /include | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff) | |
| parent | [CPUFREQ] Get rid of userspace policy struct, make userspace gov _PPC safe. (diff) | |
| download | linux-28e0cf22c1221650b4bfba48808d966160c42320.tar.xz linux-28e0cf22c1221650b4bfba48808d966160c42320.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index c31650df9241..17866d7e2b71 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 |