From 2a03e07902c40c5dc9fba68dc243ba1451bcd0e3 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <willy@parisc-linux.org>
Date: Tue, 17 Jan 2006 11:43:48 -0700
Subject: [PATCH] --- yaml --- r: 19751 b: refs/heads/master c:
 a2bb214dcd1db862fdb6421e21f1cff0c3535162 h: refs/heads/master i:   19749:
 17df93270405b95faa7ae7c332201a009cf80804   19747:
 cf9cd303bf23ee794d13ceb87d18bbc45088520f   19743:
 d38e4631e9383cd048344b6ae5dd7b3bef924cca v: v3

---
 [refs]                          | 2 +-
 trunk/arch/parisc/kernel/perf.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 20ae7ad5dae6..c4b460b14082 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85509c00073d4bdd1f4b7796180a15198f2e62da
+refs/heads/master: a2bb214dcd1db862fdb6421e21f1cff0c3535162
diff --git a/trunk/arch/parisc/kernel/perf.c b/trunk/arch/parisc/kernel/perf.c
index 11178ccbb89a..53f861c82f93 100644
--- a/trunk/arch/parisc/kernel/perf.c
+++ b/trunk/arch/parisc/kernel/perf.c
@@ -444,7 +444,6 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	uint32_t raddr[4];
 	int error = 0;
 
-	lock_kernel();
 	switch (cmd) {
 
 	    case PA_PERF_ON:
@@ -477,8 +476,6 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
   	 		error = -ENOTTY;
 	}
 
-	unlock_kernel();
-
 	return error;
 }