diff options
author | Jonathan Corbet <corbet@lwn.net> | 2008-05-18 17:32:43 -0400 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2008-06-20 16:05:53 -0400 |
commit | f2b9857eee17797541b845782ade4d7a9d50f843 (patch) | |
tree | 914a00afee2ff953199f99f7cf869e3fd83b36bd /drivers/char/ppdev.c | |
parent | 0b2806768899dba5967bcd4a3b93eaed9a1dc4f3 (diff) |
Add a bunch of cycle_kernel_lock() calls
All of the open() functions which don't need the BKL on their face may
still depend on its acquisition to serialize opens against driver
initialization. So make those functions acquire then release the BKL to be
on the safe side.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/char/ppdev.c')
-rw-r--r-- | drivers/char/ppdev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index ce1987574888..f6e6acadd9a0 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
@@ -66,6 +66,7 @@ | |||
66 | #include <linux/poll.h> | 66 | #include <linux/poll.h> |
67 | #include <linux/major.h> | 67 | #include <linux/major.h> |
68 | #include <linux/ppdev.h> | 68 | #include <linux/ppdev.h> |
69 | #include <linux/smp_lock.h> | ||
69 | #include <asm/uaccess.h> | 70 | #include <asm/uaccess.h> |
70 | 71 | ||
71 | #define PP_VERSION "ppdev: user-space parallel port driver" | 72 | #define PP_VERSION "ppdev: user-space parallel port driver" |
@@ -633,12 +634,12 @@ static int pp_ioctl(struct inode *inode, struct file *file, | |||
633 | return 0; | 634 | return 0; |
634 | } | 635 | } |
635 | 636 | ||
636 | /* No BKL needed here: only local resources used */ | ||
637 | static int pp_open (struct inode * inode, struct file * file) | 637 | static int pp_open (struct inode * inode, struct file * file) |
638 | { | 638 | { |
639 | unsigned int minor = iminor(inode); | 639 | unsigned int minor = iminor(inode); |
640 | struct pp_struct *pp; | 640 | struct pp_struct *pp; |
641 | 641 | ||
642 | cycle_kernel_lock(); | ||
642 | if (minor >= PARPORT_MAX) | 643 | if (minor >= PARPORT_MAX) |
643 | return -ENXIO; | 644 | return -ENXIO; |
644 | 645 | ||