From cda3ae25520312c8da55612534be21c844fd070c Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 7 Sep 2010 14:33:34 +0000
Subject: [PATCH] --- yaml --- r: 212277 b: refs/heads/master c:
 383f9f1741cd03687303f82543bbae11935a2ad6 h: refs/heads/master i:   212275:
 45eeafc83f520dd7473a2aa510ee350cc9995eeb v: v3

---
 [refs]                           | 2 +-
 trunk/arch/ia64/kernel/salinfo.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 210e2de7c53b..004a4e3491bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e6b1b25a92df39d2b619ed3cf74322ddef6800e
+refs/heads/master: 383f9f1741cd03687303f82543bbae11935a2ad6
diff --git a/trunk/arch/ia64/kernel/salinfo.c b/trunk/arch/ia64/kernel/salinfo.c
index aa8b5fa1a8de..45d7543b69cc 100644
--- a/trunk/arch/ia64/kernel/salinfo.c
+++ b/trunk/arch/ia64/kernel/salinfo.c
@@ -642,7 +642,7 @@ salinfo_init(void)
 	for (i = 0; i < ARRAY_SIZE(salinfo_log_name); i++) {
 		data = salinfo_data + i;
 		data->type = i;
-		init_MUTEX(&data->mutex);
+		sema_init(&data->mutex, 1);
 		dir = proc_mkdir(salinfo_log_name[i], salinfo_dir);
 		if (!dir)
 			continue;