From e24868a77820d614e5a798dda52f0ce1b15b8165 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 14 Nov 2007 06:07:56 +1100
Subject: [PATCH] --- yaml --- r: 80971 b: refs/heads/master c:
 9ee7fd9c605247baf81d196ade090698a0759e9c h: refs/heads/master i:   80969:
 1a49132100e124e0c6058ff84c52ff74e0f05b30   80967:
 5c7ee0d0757ef0773842f465102e689842b91aa7 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/macintosh/via-pmu.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index dc7bded03fd7..9388b88f4678 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6215762064311efea0618c9496cc6360cd75243d
+refs/heads/master: 9ee7fd9c605247baf81d196ade090698a0759e9c
diff --git a/trunk/drivers/macintosh/via-pmu.c b/trunk/drivers/macintosh/via-pmu.c
index dc741d3a4531..6886814b1e65 100644
--- a/trunk/drivers/macintosh/via-pmu.c
+++ b/trunk/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;
 }