lkml.org 
[lkml]   [2010]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] sn_hwperf: kill BKL usage
    Date
    This driver always gave up the BKL in its ioctl function, so just
    convert it to unlocked_ioctl and remove the BKL here.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/ia64/sn/kernel/sn2/sn_hwperf.c | 9 ++-------
    1 files changed, 2 insertions(+), 7 deletions(-)

    diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
    index 55ac3c4..d68fe0f 100644
    --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
    +++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
    @@ -30,7 +30,6 @@
    #include <linux/miscdevice.h>
    #include <linux/utsname.h>
    #include <linux/cpumask.h>
    -#include <linux/smp_lock.h>
    #include <linux/nodemask.h>
    #include <linux/smp.h>
    #include <linux/mutex.h>
    @@ -682,8 +681,7 @@ static int sn_hwperf_map_err(int hwperf_err)
    /*
    * ioctl for "sn_hwperf" misc device
    */
    -static int
    -sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
    +static long sn_hwperf_ioctl(struct file *fp, u32 op, unsigned long arg)
    {
    struct sn_hwperf_ioctl_args a;
    struct cpuinfo_ia64 *cdata;
    @@ -699,8 +697,6 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
    int i;
    int j;

    - unlock_kernel();
    -
    /* only user requests are allowed here */
    if ((op & SN_HWPERF_OP_MASK) < 10) {
    r = -EINVAL;
    @@ -859,12 +855,11 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, unsigned long arg)
    error:
    vfree(p);

    - lock_kernel();
    return r;
    }

    static const struct file_operations sn_hwperf_fops = {
    - .ioctl = sn_hwperf_ioctl,
    + .unlocked_ioctl = sn_hwperf_ioctl,
    };

    static struct miscdevice sn_hwperf_dev = {
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-04-27 16:29    [W:0.024 / U:64.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site