lkml.org 
[lkml]   [2010]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT pull] bkl removal for 2.6.34
    Linus,

    Please pull the latest bkl-drivers-for-linus git tree from:

    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git bkl-drivers-for-linus

    Thanks,

    tglx

    ------------------>
    Ingo Molnar (1):
    nvram: Drop the BKL from nvram_open()


    drivers/char/nvram.c | 3 ---
    1 files changed, 0 insertions(+), 3 deletions(-)

    diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
    index 2100a8f..7cf4518 100644
    --- a/drivers/char/nvram.c
    +++ b/drivers/char/nvram.c
    @@ -329,14 +329,12 @@ static int nvram_ioctl(struct inode *inode, struct file *file,

    static int nvram_open(struct inode *inode, struct file *file)
    {
    - lock_kernel();
    spin_lock(&nvram_state_lock);

    if ((nvram_open_cnt && (file->f_flags & O_EXCL)) ||
    (nvram_open_mode & NVRAM_EXCL) ||
    ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) {
    spin_unlock(&nvram_state_lock);
    - unlock_kernel();
    return -EBUSY;
    }

    @@ -347,7 +345,6 @@ static int nvram_open(struct inode *inode, struct file *file)
    nvram_open_cnt++;

    spin_unlock(&nvram_state_lock);
    - unlock_kernel();

    return 0;
    }

    \
     
     \ /
      Last update: 2010-02-28 17:23    [W:0.032 / U:0.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site