diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2008-05-20 19:16:06 +0200 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 14:05:58 -0600 |
| commit | cddf63d99d0d145f18b293c3d0de4af7dab2a922 (patch) | |
| tree | dd59333592ce2f899bd21f06dd5bcb05d474dea5 /net/irda | |
| parent | af96f0103d332be92c42a44accf731da667ecc03 (diff) | |
| download | linux-cddf63d99d0d145f18b293c3d0de4af7dab2a922.tar.gz linux-cddf63d99d0d145f18b293c3d0de4af7dab2a922.tar.bz2 linux-cddf63d99d0d145f18b293c3d0de4af7dab2a922.zip | |
irnet_ppp: BKL pushdown
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/irda')
| -rw-r--r-- | net/irda/irnet/irnet.h | 1 | ||||
| -rw-r--r-- | net/irda/irnet/irnet_ppp.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h index b001c361ad30..bccf4d0059f0 100644 --- a/net/irda/irnet/irnet.h +++ b/net/irda/irnet/irnet.h @@ -241,6 +241,7 @@ #include <linux/module.h> #include <linux/kernel.h> +#include <linux/smp_lock.h> #include <linux/skbuff.h> #include <linux/tty.h> #include <linux/proc_fs.h> diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index e0eab5927c4f..e84a70dd346b 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c @@ -479,6 +479,7 @@ dev_irnet_open(struct inode * inode, ap = kzalloc(sizeof(*ap), GFP_KERNEL); DABORT(ap == NULL, -ENOMEM, FS_ERROR, "Can't allocate struct irnet...\n"); + lock_kernel(); /* initialize the irnet structure */ ap->file = file; @@ -500,6 +501,7 @@ dev_irnet_open(struct inode * inode, { DERROR(FS_ERROR, "Can't setup IrDA link...\n"); kfree(ap); + unlock_kernel(); return err; } @@ -510,6 +512,7 @@ dev_irnet_open(struct inode * inode, file->private_data = ap; DEXIT(FS_TRACE, " - ap=0x%p\n", ap); + unlock_kernel(); return 0; } |