The patch titled
sem2mutex: drivers/ieee1394
has been removed from the -mm tree. Its filename is
sem2mutex-drivers-ieee1394.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Semaphore to mutex conversion.
The conversion was generated via scripts, and the result was validated
automatically via a script as well.
Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/hosts.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/ieee1394/hosts.c~sem2mutex-drivers-ieee1394 drivers/ieee1394/hosts.c
--- 25/drivers/ieee1394/hosts.c~sem2mutex-drivers-ieee1394 Fri Jan 13 15:58:12 2006
+++ 25-akpm/drivers/ieee1394/hosts.c Fri Jan 13 15:58:12 2006
@@ -19,6 +19,7 @@
#include <linux/pci.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
+#include <linux/mutex.h>
#include "csr1212.h"
#include "ieee1394.h"
@@ -105,7 +106,7 @@ static int alloc_hostnum_cb(struct hpsb_
* Return Value: a pointer to the &hpsb_host if succesful, %NULL if
* no memory was available.
*/
-static DECLARE_MUTEX(host_num_alloc);
+static DEFINE_MUTEX(host_num_alloc);
struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
struct device *dev)
@@ -148,7 +149,7 @@ struct hpsb_host *hpsb_alloc_host(struct
h->topology_map = h->csr.topology_map + 3;
h->speed_map = (u8 *)(h->csr.speed_map + 2);
- down(&host_num_alloc);
+ mutex_lock(&host_num_alloc);
while (nodemgr_for_each_host(&hostnum, alloc_hostnum_cb))
hostnum++;
@@ -167,7 +168,7 @@ struct hpsb_host *hpsb_alloc_host(struct
class_device_register(&h->class_dev);
get_device(&h->device);
- up(&host_num_alloc);
+ mutex_unlock(&host_num_alloc);
return h;
}
_
Patches currently in -mm which might be from arjan@xxxxxxxxxxxxx are
origin.patch
sem2mutex-drivers-acpi.patch
git-ieee1394.patch
git-mtd.patch
qla2xxx-lock-ordering-fix.patch
qla2xxx-lock-ordering-fix-warning-fix.patch
reiser4.patch
debug-shared-irqs.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
