diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 19:16:31 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-02 15:06:24 -0600 |
| commit | b691750098f830b748540cd955f5ac56545bab25 (patch) | |
| tree | a45a75a55bd508fe72f2479d2f0e3dcf1b7782f8 /arch/parisc | |
| parent | 6044c319d11051f3462dafd0e7a900ef121d7bc7 (diff) | |
| download | kernel_goldelico_gta04-b691750098f830b748540cd955f5ac56545bab25.zip kernel_goldelico_gta04-b691750098f830b748540cd955f5ac56545bab25.tar.gz kernel_goldelico_gta04-b691750098f830b748540cd955f5ac56545bab25.tar.bz2 | |
parisc-kernel-perf: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/perf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c index 89d6d5a..f696f57 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; } |