From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 13 Nov 2007 19:07:56 +0000 (+1100)
Subject: [POWERPC] PMU: Don't lock_kernel()
X-Git-Tag: v2.6.25-rc1~1131^2~373
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ee7fd9c605247baf81d196ade090698a0759e9c;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index dc741d3a453..6886814b1e6 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -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;
 }