summaryrefslogtreecommitdiffstats
path: root/kernel/pm_qos_params.c
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2009-08-06 13:22:40 -0600
committerThomas Gleixner <tglx@linutronix.de>2009-10-14 15:31:10 +0200
commite6fe07a014c7a3466dcd1a387a9ac04d84c2703c (patch)
tree435990e3dbe92faed02ef65b0d5ec0f3913b8347 /kernel/pm_qos_params.c
parent80f506918fdaaca6b574ba931536a58ce015c7be (diff)
downloadlinux-stable-e6fe07a014c7a3466dcd1a387a9ac04d84c2703c.tar.gz
linux-stable-e6fe07a014c7a3466dcd1a387a9ac04d84c2703c.tar.bz2
linux-stable-e6fe07a014c7a3466dcd1a387a9ac04d84c2703c.zip
pm_qos: remove BKL
pm_qos_power_open got its lock_kernel() calls from the open() pushdown. A look at the code shows that the only global resources accessed are pm_qos_array and "name". pm_qos_array doesn't change (things pointed to therein do change, but they are atomics and/or are protected by pm_qos_lock). Accesses to "name" are totally unprotected with or without the BKL; that will be fixed shortly. The BKL is not helpful here; take it out. Signed-off-by: Jonathan Corbet <corbet@lwn.net> LKML-Reference: <20091010153349.071381158@linutronix.de> Acked-by: Mark Gross <mgross@linux.intel.com> Reviewed-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/pm_qos_params.c')
-rw-r--r--kernel/pm_qos_params.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/pm_qos_params.c b/kernel/pm_qos_params.c
index dfdec524d1b7..d96b83ed21cb 100644
--- a/kernel/pm_qos_params.c
+++ b/kernel/pm_qos_params.c
@@ -29,7 +29,6 @@
#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>
@@ -352,20 +351,15 @@ 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) {
- unlock_kernel();
+ if (ret >= 0)
return 0;
- }
}
- unlock_kernel();
-
return -EPERM;
}