From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 17:16:31 +0000 (+0200)
Subject: parisc-kernel-perf: BKL pushdown
X-Git-Tag: v2.6.27-rc1~1103^2~36
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b691750098f830b748540cd955f5ac56545bab25;p=linux-2.6-omap-h63xx.git

parisc-kernel-perf: BKL pushdown

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 89d6d5ad44b..f696f57faa1 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -46,6 +46,7 @@
 #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>
@@ -260,13 +261,16 @@ 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;
 }