The patch titled tpm: num_opens to is_open variable change has been removed from the -mm tree. Its filename was tpm-num_opens-to-is_open-variable-change.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tpm: num_opens to is_open variable change From: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx> Renames num_open to is_open, as only one process can open the file at a time. Signed-off-by: Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> Signed-off-by: Rajiv Andrade <srajiv@xxxxxxxxxxxxxxxxxx> Cc: "Serge E. Hallyn" <serue@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/tpm/tpm.c | 7 +++---- drivers/char/tpm/tpm.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff -puN drivers/char/tpm/tpm.c~tpm-num_opens-to-is_open-variable-change drivers/char/tpm/tpm.c --- a/drivers/char/tpm/tpm.c~tpm-num_opens-to-is_open-variable-change +++ a/drivers/char/tpm/tpm.c @@ -985,20 +985,19 @@ int tpm_open(struct inode *inode, struct goto err_out; } - if (chip->num_opens) { + if (test_and_set_bit(0, &chip->is_open)) { dev_dbg(chip->dev, "Another process owns this TPM\n"); rc = -EBUSY; goto err_out; } - chip->num_opens++; get_device(chip->dev); spin_unlock(&driver_lock); chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL); if (chip->data_buffer == NULL) { - chip->num_opens--; + clear_bit(0, &chip->is_open); put_device(chip->dev); return -ENOMEM; } @@ -1023,7 +1022,7 @@ int tpm_release(struct inode *inode, str file->private_data = NULL; del_singleshot_timer_sync(&chip->user_read_timer); atomic_set(&chip->data_pending, 0); - chip->num_opens--; + clear_bit(0, &chip->is_open); put_device(chip->dev); kfree(chip->data_buffer); spin_unlock(&driver_lock); diff -puN drivers/char/tpm/tpm.h~tpm-num_opens-to-is_open-variable-change drivers/char/tpm/tpm.h --- a/drivers/char/tpm/tpm.h~tpm-num_opens-to-is_open-variable-change +++ a/drivers/char/tpm/tpm.h @@ -90,7 +90,7 @@ struct tpm_chip { struct device *dev; /* Device stuff */ int dev_num; /* /dev/tpm# */ - int num_opens; /* only one allowed */ + unsigned long is_open; /* only one allowed */ int time_expired; /* Data passed to and from the tpm via the read/write calls */ _ Patches currently in -mm which might be from srajiv@xxxxxxxxxxxxxxxxxx are origin.patch tpm-include-moderated-for-non-subscribers-notation-in-maintainers.patch drivers-char-tpm-tpmc-fix-error-patch-memory-leak.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html