diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 19:16:33 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 15:06:24 -0600 |
| commit | db26e64dc3f0d51c4db1a625c248a81f7850eee9 (patch) | |
| tree | 52d748b63a3e9e5f8b385737641acc8640711d28 /kernel/pm_qos_params.c | |
| parent | b691750098f830b748540cd955f5ac56545bab25 (diff) | |
| download | linux-db26e64dc3f0d51c4db1a625c248a81f7850eee9.tar.bz2 | |
pm_qos_params: BKL pushdown
[jmc: added <linux/smp_lock.h>]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'kernel/pm_qos_params.c')
| -rw-r--r-- | kernel/pm_qos_params.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c index 0afe32be4c85..8cb757026386 100644 --- a/kernel/pm_qos_params.c +++ b/kernel/pm_qos_params.c @@ -29,6 +29,7 @@ #include <linux/pm_qos_params.h> #include <linux/sched.h> +#include <linux/smp_lock.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/time.h> @@ -358,15 +359,19 @@ static int pm_qos_power_open(struct inode *inode, struct file *filp) int ret; long pm_qos_class; + lock_kernel(); pm_qos_class = find_pm_qos_object_by_minor(iminor(inode)); if (pm_qos_class >= 0) { filp->private_data = (void *)pm_qos_class; sprintf(name, "process_%d", current->pid); ret = pm_qos_add_requirement(pm_qos_class, name, PM_QOS_DEFAULT_VALUE); - if (ret >= 0) + if (ret >= 0) { + unlock_kernel(); return 0; + } } + unlock_kernel(); return -EPERM; } |