git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
perf.c
diff --git
a/arch/parisc/kernel/perf.c
b/arch/parisc/kernel/perf.c
index
f9f6783
..
ba0c053
100644
(file)
--- 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/init.h>
#include <linux/proc_fs.h>
#include <linux/miscdevice.h>
-#include <linux/smp_lock.h>
#include <linux/spinlock.h>
#include <asm/uaccess.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)
{
*/
static int perf_open(struct inode *inode, struct file *file)
{
- lock_kernel();
spin_lock(&perf_lock);
if (perf_enabled) {
spin_unlock(&perf_lock);
spin_lock(&perf_lock);
if (perf_enabled) {
spin_unlock(&perf_lock);
- unlock_kernel();
return -EBUSY;
}
perf_enabled = 1;
spin_unlock(&perf_lock);
return -EBUSY;
}
perf_enabled = 1;
spin_unlock(&perf_lock);
- unlock_kernel();
return 0;
}
return 0;
}