From bf507263c479556a6d89e4dab7d8ce0e0ce64c1c Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:16:24 +0200
Subject: [PATCH] --- yaml --- r: 100368 b: refs/heads/master c:
 fd3e05b6c82ebee06f888482975172028e89382d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9ae074060cb..3f787f0028e0 100644
--- 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
index 0ce07a339c7e..ce5af2aa8843 100644
--- 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;