From bf74e6b7e2827de9bbc90cce46c4746990e3fd28 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 11 Sep 2010 19:31:43 +0200
Subject: [PATCH] --- yaml --- r: 212923 b: refs/heads/master c:
 efbec1cd042008b49fe3cad45604088c54905a06 h: refs/heads/master i:   212921:
 ee503d700eb52eb0ae1f21a6c25885d64f55b76d   212919:
 8ab49a92fc523ce958767baacc7ed3095927fdb2 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/tlclk.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b2644316a64d..94601f2c1416 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4a047272566b44b44222369d50a307c708c4f74
+refs/heads/master: efbec1cd042008b49fe3cad45604088c54905a06
diff --git a/trunk/drivers/char/tlclk.c b/trunk/drivers/char/tlclk.c
index 80ea6bcfffdc..e32cbf0c9a0b 100644
--- a/trunk/drivers/char/tlclk.c
+++ b/trunk/drivers/char/tlclk.c
@@ -37,7 +37,7 @@
 #include <linux/ioport.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/sysfs.h>
 #include <linux/device.h>
@@ -206,7 +206,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
 {
 	int result;
 
-	lock_kernel();
+	mutex_lock(&tlclk_mutex);
 	if (test_and_set_bit(0, &useflags)) {
 		result = -EBUSY;
 		/* this legacy device is always one per system and it doesn't
@@ -229,7 +229,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
 		inb(TLCLK_REG6);	/* Clear interrupt events */
 
 out:
-	unlock_kernel();
+	mutex_unlock(&tlclk_mutex);
 	return result;
 }