diff options
| -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 | } |
