lkml.org 
[lkml]   [2008]   [Oct]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] TPM: update char dev BKL pushdown
    Date
    This patch removes the BKL calls from the TPM driver, which
    were added in the overall misc-char-dev-BKL-pushdown.patch,
    as they are not needed.

    Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: Rajiv Andrade <srajiv@linux.vnet.ibm.com>
    ---
    drivers/char/tpm/tpm.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
    index ae766d8..ceba608 100644
    --- a/drivers/char/tpm/tpm.c
    +++ b/drivers/char/tpm/tpm.c
    @@ -954,13 +954,16 @@ EXPORT_SYMBOL_GPL(tpm_store_cancel);

    /*
    * Device file system interface to the TPM
    + *
    + * It's assured that the chip will be opened just once,
    + * by the check of is_open variable, which is protected
    + * by driver_lock.
    */
    int tpm_open(struct inode *inode, struct file *file)
    {
    int rc = 0, minor = iminor(inode);
    struct tpm_chip *chip = NULL, *pos;

    - lock_kernel();
    spin_lock(&driver_lock);

    list_for_each_entry(pos, &tpm_chip_list, list) {
    @@ -990,19 +993,16 @@ int tpm_open(struct inode *inode, struct file *file)
    if (chip->data_buffer == NULL) {
    chip->num_opens--;
    put_device(chip->dev);
    - unlock_kernel();
    return -ENOMEM;
    }

    atomic_set(&chip->data_pending, 0);

    file->private_data = chip;
    - unlock_kernel();
    return 0;

    err_out:
    spin_unlock(&driver_lock);
    - unlock_kernel();
    return rc;
    }
    EXPORT_SYMBOL_GPL(tpm_open);
    --
    1.5.6.3


    \
     
     \ /
      Last update: 2008-10-03 18:35    [W:0.020 / U:4.404 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site