Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 212920
b: refs/heads/master
c: fa0d4c2
h: refs/heads/master
v: v3
  • Loading branch information
Arnd Bergmann committed Oct 16, 2010
1 parent 8ab49a9 commit e9a6b44
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0890b5880df6a4989336add11f3a22122b26d9e1
refs/heads/master: fa0d4c26be9f989816b30626f6c67d9e7ef867f8
4 changes: 0 additions & 4 deletions trunk/arch/parisc/kernel/perf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit e9a6b44

Please sign in to comment.