From a9cb87132c4503ce38fdf99b9c3fc5a157dd0315 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:35 +0200
Subject: [PATCH] --- yaml --- r: 100375 b: refs/heads/master c:
 f29b889edef0c3ab98732c84247c790a1583cb94 h: refs/heads/master i:   100373:
 f35f85ae80a28ede452696b851a14adb5f1f93dd   100371:
 57b60ad785189cf6727fc332fdd52d27464ec97a   100367:
 f0b274da8fc9769a65efe0effa49f8db0c7fdd9e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/sbus/char/riowatchdog.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index be9dc7704bf1..d03771b8784e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db26e64dc3f0d51c4db1a625c248a81f7850eee9
+refs/heads/master: f29b889edef0c3ab98732c84247c790a1583cb94
diff --git a/trunk/drivers/sbus/char/riowatchdog.c b/trunk/drivers/sbus/char/riowatchdog.c
index a2fc6b8c1334..88c0fc6395e1 100644
--- a/trunk/drivers/sbus/char/riowatchdog.c
+++ b/trunk/drivers/sbus/char/riowatchdog.c
@@ -11,6 +11,7 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/miscdevice.h>
+#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/ebus.h>
@@ -116,6 +117,7 @@ static void riowd_starttimer(void)
 
 static int riowd_open(struct inode *inode, struct file *filp)
 {
+	cycle_kernel_lock();
 	nonseekable_open(inode, filp);
 	return 0;
 }