]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] PMU: Don't lock_kernel()
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 13 Nov 2007 19:07:56 +0000 (06:07 +1100)
committerPaul Mackerras <paulus@samba.org>
Mon, 3 Dec 2007 02:56:26 +0000 (13:56 +1100)
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>
drivers/macintosh/via-pmu.c

index dc741d3a4531cbe365aa8b89256a0337782b5b00..6886814b1e6551ae4af584c84e66aef55f29ebff 100644 (file)
@@ -33,7 +33,6 @@
 #include <linux/adb.h>
 #include <linux/pmu.h>
 #include <linux/cuda.h>
-#include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/pm.h>
@@ -2547,7 +2546,6 @@ pmu_release(struct inode *inode, struct file *file)
        struct pmu_private *pp = file->private_data;
        unsigned long flags;
 
-       lock_kernel();
        if (pp != 0) {
                file->private_data = NULL;
                spin_lock_irqsave(&all_pvt_lock, flags);
@@ -2561,7 +2559,6 @@ pmu_release(struct inode *inode, struct file *file)
 
                kfree(pp);
        }
-       unlock_kernel();
        return 0;
 }