diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-11-13 14:07:56 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-02 21:56:26 -0500 |
commit | 9ee7fd9c605247baf81d196ade090698a0759e9c (patch) | |
tree | 0eaeb4a077299278a473cb5366bd44bfc30708e9 /drivers/macintosh | |
parent | 6215762064311efea0618c9496cc6360cd75243d (diff) |
[POWERPC] PMU: Don't lock_kernel()
I see nothing that this lock_kernel() actually protects against,
so remove it.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/via-pmu.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index dc741d3a4531..6886814b1e65 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <linux/adb.h> | 33 | #include <linux/adb.h> |
34 | #include <linux/pmu.h> | 34 | #include <linux/pmu.h> |
35 | #include <linux/cuda.h> | 35 | #include <linux/cuda.h> |
36 | #include <linux/smp_lock.h> | ||
37 | #include <linux/module.h> | 36 | #include <linux/module.h> |
38 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
39 | #include <linux/pm.h> | 38 | #include <linux/pm.h> |
@@ -2547,7 +2546,6 @@ pmu_release(struct inode *inode, struct file *file) | |||
2547 | struct pmu_private *pp = file->private_data; | 2546 | struct pmu_private *pp = file->private_data; |
2548 | unsigned long flags; | 2547 | unsigned long flags; |
2549 | 2548 | ||
2550 | lock_kernel(); | ||
2551 | if (pp != 0) { | 2549 | if (pp != 0) { |
2552 | file->private_data = NULL; | 2550 | file->private_data = NULL; |
2553 | spin_lock_irqsave(&all_pvt_lock, flags); | 2551 | spin_lock_irqsave(&all_pvt_lock, flags); |
@@ -2561,7 +2559,6 @@ pmu_release(struct inode *inode, struct file *file) | |||
2561 | 2559 | ||
2562 | kfree(pp); | 2560 | kfree(pp); |
2563 | } | 2561 | } |
2564 | unlock_kernel(); | ||
2565 | return 0; | 2562 | return 0; |
2566 | } | 2563 | } |
2567 | 2564 | ||