From 280a73981253f6fbde9d377ca5d8f50170b109fa Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 31 Mar 2006 02:29:40 -0800
Subject: [PATCH] --- yaml --- r: 24835 b: refs/heads/master c:
 040d79f906654d55c810313f29c6605593bf21c5 h: refs/heads/master i:   24833:
 128b32a7f46f2e8898eea1d099f032160eb678b4   24831:
 f349d84973f205a3dc6ba070b5932a9fa98733ef v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/mtd/devices/doc2000.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a36b4362b729..30f2f8c1e03b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37466ea85a7f7c9eef071a334e074265df4d1305
+refs/heads/master: 040d79f906654d55c810313f29c6605593bf21c5
diff --git a/trunk/drivers/mtd/devices/doc2000.c b/trunk/drivers/mtd/devices/doc2000.c
index e4345cf744a2..0f2c956a90d3 100644
--- a/trunk/drivers/mtd/devices/doc2000.c
+++ b/trunk/drivers/mtd/devices/doc2000.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
+#include <linux/mutex.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
@@ -975,13 +976,13 @@ static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
 			  u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
 	static char static_buf[512];
-	static DECLARE_MUTEX(writev_buf_sem);
+	static DEFINE_MUTEX(writev_buf_mutex);
 
 	size_t totretlen = 0;
 	size_t thisvecofs = 0;
 	int ret= 0;
 
-	down(&writev_buf_sem);
+	mutex_lock(&writev_buf_mutex);
 
 	while(count) {
 		size_t thislen, thisretlen;
@@ -1024,7 +1025,7 @@ static int doc_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
 		to += thislen;
 	}
 
-	up(&writev_buf_sem);
+	mutex_unlock(&writev_buf_mutex);
 	*retlen = totretlen;
 	return ret;
 }