From e9a6b44b6b0a78b50014387bbbc745fca9135589 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 11 Sep 2010 18:24:46 +0200
Subject: [PATCH] --- yaml --- r: 212920 b: refs/heads/master c:
 fa0d4c26be9f989816b30626f6c67d9e7ef867f8 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 29e4de4702e8..c06ef41ed45a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0890b5880df6a4989336add11f3a22122b26d9e1
+refs/heads/master: fa0d4c26be9f989816b30626f6c67d9e7ef867f8
diff --git a/trunk/arch/parisc/kernel/perf.c b/trunk/arch/parisc/kernel/perf.c
index f9f6783e4bdd..ba0c053e25ae 100644
--- a/trunk/arch/parisc/kernel/perf.c
+++ b/trunk/arch/parisc/kernel/perf.c
@@ -46,7 +46,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 
 #include <asm/uaccess.h>
@@ -261,16 +260,13 @@ printk("Preparing to start counters\n");
  */
 static int perf_open(struct inode *inode, struct file *file)
 {
-	lock_kernel();
 	spin_lock(&perf_lock);
 	if (perf_enabled) {
 		spin_unlock(&perf_lock);
-		unlock_kernel();
 		return -EBUSY;
 	}
 	perf_enabled = 1;
  	spin_unlock(&perf_lock);
-	unlock_kernel();
 
 	return 0;
 }