From 27f3d427b8bca838678defcdbc18b440528b1efd Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 14 Oct 2009 01:19:46 -0700
Subject: [PATCH] --- yaml --- r: 170695 b: refs/heads/master c:
 deed49fbb68d7d07ec6c3dfd06bffc74e9abc6fa h: refs/heads/master i:   170693:
 4a70318fcae871985969cdd7b5d35a7a30dc245b   170691:
 48b732ed5edfeb5fd2c1fd282bf01326424c5988   170687:
 d898294d5d334669a90b8ea63f4bd0dad118dfec v: v3

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

diff --git a/[refs] b/[refs]
index 15f8bc160108..e462c4a394ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 421355de876b9f3fcc7e4cb6026e416fb12a5068
+refs/heads/master: deed49fbb68d7d07ec6c3dfd06bffc74e9abc6fa
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 4fdfa2ae5418..9c59a82784dc 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -44,7 +44,6 @@
 #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>
@@ -1285,7 +1284,6 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 
 	DBG(KERN_INFO "%s: tun_chr_fasync %d\n", tun->dev->name, on);
 
-	lock_kernel();
 	if ((ret = fasync_helper(fd, file, on, &tun->fasync)) < 0)
 		goto out;
 
@@ -1298,7 +1296,6 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 		tun->flags &= ~TUN_FASYNC;
 	ret = 0;
 out:
-	unlock_kernel();
 	tun_put(tun);
 	return ret;
 }
@@ -1306,7 +1303,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on)
 static int tun_chr_open(struct inode *inode, struct file * file)
 {
 	struct tun_file *tfile;
-	cycle_kernel_lock();
+
 	DBG1(KERN_INFO "tunX: tun_chr_open\n");
 
 	tfile = kmalloc(sizeof(*tfile), GFP_KERNEL);