Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[powerpc.git] / arch / parisc / kernel / perf.c

diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index 11178cc..53f861c 100644 (file)
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -444,7 +444,6 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        uint32_t raddr[4];
        int error = 0;
 
-       lock_kernel();
        switch (cmd) {
 
            case PA_PERF_ON:
@@ -477,8 +476,6 @@ static long perf_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                        error = -ENOTTY;
        }
 
-       unlock_kernel();
-
        return error;
 }