---

yaml --- r: 100368 b: refs/heads/master c: fd3e05b h: refs/heads/master v: v3
git-mirror · Jul 2, 2008 · bf50726 · bf50726
1 parent f0b274d
commit bf50726
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db41bc9c4dfeed656dfd63d26883f81abc4005df
+refs/heads/master: fd3e05b6c82ebee06f888482975172028e89382d
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
@@ -48,6 +48,7 @@
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/slab.h>
+#include <linux/smp_lock.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/init.h>
@@ -797,6 +798,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 
 static int tun_chr_open(struct inode *inode, struct file * file)
 {
+	cycle_kernel_lock();
 	DBG1(KERN_INFO "tunX: tun_chr_open\n");
 	file->private_data = NULL;
 	return 0;