summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2008-05-20 19:16:24 +0200
committerJonathan Corbet <corbet@lwn.net>2008-07-02 15:06:23 -0600
commitfd3e05b6c82ebee06f888482975172028e89382d (patch)
treee76544e8cf04a629271c04074458ae9b04e86ca4
parentdb41bc9c4dfeed656dfd63d26883f81abc4005df (diff)
downloadblackbird-op-linux-fd3e05b6c82ebee06f888482975172028e89382d.tar.gz
blackbird-op-linux-fd3e05b6c82ebee06f888482975172028e89382d.zip
net-tun: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--drivers/net/tun.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 0ce07a339c7e..ce5af2aa8843 100644
--- a/drivers/net/tun.c
+++ b/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;
OpenPOWER on IntegriCloud