diff options
author | Arnd Bergmann <arnd@arndb.de> | 2010-09-11 12:24:46 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2010-10-16 16:43:08 -0400 |
commit | fa0d4c26be9f989816b30626f6c67d9e7ef867f8 (patch) | |
tree | 3085346ad864e05f876f4f774401a557778c8ff8 /arch/parisc/kernel/perf.c | |
parent | 0890b5880df6a4989336add11f3a22122b26d9e1 (diff) |
parisc: remove big kernel lock
The parisc version of the perf code is sufficiently
protected by its own spinlock, no need to use the BKL.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: linux-parisc@vger.kernel.org
Diffstat (limited to 'arch/parisc/kernel/perf.c')
-rw-r--r-- | arch/parisc/kernel/perf.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c index f9f6783e4bdd..ba0c053e25ae 100644 --- a/arch/parisc/kernel/perf.c +++ b/arch/parisc/kernel/perf.c | |||
@@ -46,7 +46,6 @@ | |||
46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
47 | #include <linux/proc_fs.h> | 47 | #include <linux/proc_fs.h> |
48 | #include <linux/miscdevice.h> | 48 | #include <linux/miscdevice.h> |
49 | #include <linux/smp_lock.h> | ||
50 | #include <linux/spinlock.h> | 49 | #include <linux/spinlock.h> |
51 | 50 | ||
52 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
@@ -261,16 +260,13 @@ printk("Preparing to start counters\n"); | |||
261 | */ | 260 | */ |
262 | static int perf_open(struct inode *inode, struct file *file) | 261 | static int perf_open(struct inode *inode, struct file *file) |
263 | { | 262 | { |
264 | lock_kernel(); | ||
265 | spin_lock(&perf_lock); | 263 | spin_lock(&perf_lock); |
266 | if (perf_enabled) { | 264 | if (perf_enabled) { |
267 | spin_unlock(&perf_lock); | 265 | spin_unlock(&perf_lock); |
268 | unlock_kernel(); | ||
269 | return -EBUSY; | 266 | return -EBUSY; |
270 | } | 267 | } |
271 | perf_enabled = 1; | 268 | perf_enabled = 1; |
272 | spin_unlock(&perf_lock); | 269 | spin_unlock(&perf_lock); |
273 | unlock_kernel(); | ||
274 | 270 | ||
275 | return 0; | 271 | return 0; |
276 | } | 272 | } |