Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

[cascardo/linux.git] / drivers / s390 / char / vmwatchdog.c

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 56b3eab..21a2a82 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/watchdog.h>
+#include <linux/smp_lock.h>
 
 #include <asm/ebcdic.h>
 #include <asm/io.h>
@@ -121,11 +122,15 @@ static int __init vmwdt_probe(void)
 static int vmwdt_open(struct inode *i, struct file *f)
 {
        int ret;
-       if (test_and_set_bit(0, &vmwdt_is_open))
+       lock_kernel();
+       if (test_and_set_bit(0, &vmwdt_is_open)) {
+               unlock_kernel();
                return -EBUSY;
+       }
        ret = vmwdt_keepalive();
        if (ret)
                clear_bit(0, &vmwdt_is_open);
+       unlock_kernel();
        return ret ? ret : nonseekable_open(i, f);
 }