From patchwork Tue Sep 14 19:34:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arnd Bergmann <arnd@arndb.de>
X-Patchwork-Id: 180292
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8EJZaCD004283
	for <patchwork-parisc@patchwork.kernel.org>;
	Tue, 14 Sep 2010 19:35:37 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754838Ab0INTfh (ORCPT
	<rfc822;patchwork-parisc@patchwork.kernel.org>);
	Tue, 14 Sep 2010 15:35:37 -0400
Received: from moutng.kundenserver.de ([212.227.126.171]:55973 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754128Ab0INTfg (ORCPT
	<rfc822;linux-parisc@vger.kernel.org>);
	Tue, 14 Sep 2010 15:35:36 -0400
Received: from localhost.localdomain (port-92-200-37-189.dynamic.qsc.de
	[92.200.37.189])
	by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis)
	id 0LosLT-1ONeBj1a0J-00gfB6; Tue, 14 Sep 2010 21:35:32 +0200
From: Arnd Bergmann <arnd@arndb.de>
To: arnd@arndb.de
Cc: Kyle McMartin <kyle@mcmartin.ca>, Helge Deller <deller@gmx.de>,
	"James E.J. Bottomley" <jejb@parisc-linux.org>,
	linux-parisc@vger.kernel.org
Subject: [PATCH 08/18] parisc: remove big kernel lock
Date: Tue, 14 Sep 2010 21:34:59 +0200
Message-Id: <1284492909-7147-9-git-send-email-arnd@arndb.de>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <1284492909-7147-1-git-send-email-arnd@arndb.de>
References: <1284492909-7147-1-git-send-email-arnd@arndb.de>
X-Provags-ID: V02:K0:MCGBfbMD+XQRtZ2cTafjj7z434XzSzSr56BFckF/vQF
	kBSzV70s67x0ZJYhif/xfud3RwEHtBi5aQhQ/EXyAIhw/qQcJu
	im9dxEEjkqCcrZgvjJVQcehxwzBpfPKFeNYQeti4vgTZxlodWB
	odQ0L52/Ld0Og10eCv3PUG0uhJ/2kBRf2qu/d1TP9O3Vh0VXVk
	0BWmDv343Pdz5gg1vdHOQ==
Sender: linux-parisc-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-parisc.vger.kernel.org>
X-Mailing-List: linux-parisc@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Tue, 14 Sep 2010 19:35:37 +0000 (UTC)


diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index f9f6783..ba0c053 100644
--- a/arch/parisc/kernel/perf.c
+++ b/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;
 }