The patch titled
MegaRAID SAS: convert aen_mutex to the mutex API
has been added to the -mm tree. Its filename is
megaraid-sas-convert-aen_mutex-to-the-mutex-api.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: MegaRAID SAS: convert aen_mutex to the mutex API
From: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
MegaRAID SAS: Convert aen_mutex to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Cc: <megaraidlinux@xxxxxxx>
Cc: Sumant Patro <sumant.patro@xxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/megaraid/megaraid_sas.c | 7 ++++---
drivers/scsi/megaraid/megaraid_sas.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff -puN drivers/scsi/megaraid/megaraid_sas.c~megaraid-sas-convert-aen_mutex-to-the-mutex-api drivers/scsi/megaraid/megaraid_sas.c
--- a/drivers/scsi/megaraid/megaraid_sas.c~megaraid-sas-convert-aen_mutex-to-the-mutex-api
+++ a/drivers/scsi/megaraid/megaraid_sas.c
@@ -31,6 +31,7 @@
#include <linux/moduleparam.h>
#include <linux/module.h>
#include <linux/spinlock.h>
+#include <linux/mutex.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/uio.h>
@@ -2358,7 +2359,7 @@ megasas_probe_one(struct pci_dev *pdev,
spin_lock_init(&instance->cmd_pool_lock);
- sema_init(&instance->aen_mutex, 1);
+ mutex_init(&instance->aen_mutex);
sema_init(&instance->ioctl_sem, MEGASAS_INT_CMDS);
/*
@@ -2874,10 +2875,10 @@ static int megasas_mgmt_ioctl_aen(struct
if (!instance)
return -ENODEV;
- down(&instance->aen_mutex);
+ mutex_lock(&instance->aen_mutex);
error = megasas_register_aen(instance, aen.seq_num,
aen.class_locale_word);
- up(&instance->aen_mutex);
+ mutex_unlock(&instance->aen_mutex);
return error;
}
diff -puN drivers/scsi/megaraid/megaraid_sas.h~megaraid-sas-convert-aen_mutex-to-the-mutex-api drivers/scsi/megaraid/megaraid_sas.h
--- a/drivers/scsi/megaraid/megaraid_sas.h~megaraid-sas-convert-aen_mutex-to-the-mutex-api
+++ a/drivers/scsi/megaraid/megaraid_sas.h
@@ -1089,7 +1089,7 @@ struct megasas_instance {
struct megasas_evt_detail *evt_detail;
dma_addr_t evt_detail_h;
struct megasas_cmd *aen_cmd;
- struct semaphore aen_mutex;
+ struct mutex aen_mutex;
struct semaphore ioctl_sem;
struct Scsi_Host *host;
_
Patches currently in -mm which might be from matthias.kaehlcke@xxxxxxxxx are
origin.patch
generic-ac97-mixer-modem-oss-use-list_for_each_entry.patch
git-hwmon.patch
megaraid-sas-convert-aen_mutex-to-the-mutex-api.patch
parallel-port-convert-port_mutex-to-the-mutex-api.patch
parallel-port-convert-port_mutex-to-the-mutex-api-checkpatch-fixes.patch
mbcs-convert-algolock-to-mutex.patch
mbcs-convert-dmawritelock-to-mutex.patch
mbcs-convert-dmareadlock-to-mutex.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
