From faf3e999373c0f353a1cf54c5b470c07c63585ce Mon Sep 17 00:00:00 2001
From: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Date: Sat, 27 Oct 2007 09:48:46 +0200
Subject: [PATCH] --- yaml --- r: 77015 b: refs/heads/master c:
 e5a69e27cc193f98c9a5a9086e3bf85528170623 h: refs/heads/master i:   77013:
 2a7581da3f9f88e829f44967b330de2e04de7513   77011:
 f29e544e29e1723c9091529f9faaa38edfa73cdb   77007:
 e11f4c9812ffead8f3c73f1779e52cfc7c502b5e v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/scsi/megaraid/megaraid_sas.c | 7 ++++---
 trunk/drivers/scsi/megaraid/megaraid_sas.h | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dc8b0bcaf42a..8405db1f27d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ce7c6588637614b00072569679791a04898c790
+refs/heads/master: e5a69e27cc193f98c9a5a9086e3bf85528170623
diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas.c b/trunk/drivers/scsi/megaraid/megaraid_sas.c
index e3c5c5282203..3ad379fcd18f 100644
--- a/trunk/drivers/scsi/megaraid/megaraid_sas.c
+++ b/trunk/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, const struct pci_device_id *id)
 
 	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 file *file, unsigned long arg)
 	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 --git a/trunk/drivers/scsi/megaraid/megaraid_sas.h b/trunk/drivers/scsi/megaraid/megaraid_sas.h
index 4dffc918a414..08c74c991781 100644
--- a/trunk/drivers/scsi/megaraid/megaraid_sas.h
+++ b/trunk/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;