diff options
Diffstat (limited to 'drivers/sbus/char/openprom.c')
| -rw-r--r-- | drivers/sbus/char/openprom.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c index aacbe14e2e7..5843288f64b 100644 --- a/drivers/sbus/char/openprom.c +++ b/drivers/sbus/char/openprom.c @@ -33,14 +33,13 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/slab.h> -#include <linux/smp_lock.h> +#include <linux/mutex.h> #include <linux/string.h> #include <linux/miscdevice.h> #include <linux/init.h> #include <linux/fs.h> #include <asm/oplib.h> #include <asm/prom.h> -#include <asm/system.h> #include <asm/uaccess.h> #include <asm/openpromio.h> #ifdef CONFIG_PCI @@ -61,6 +60,7 @@ typedef struct openprom_private_data } DATA; /* ID of the PROM node containing all of the EEPROM options. */ +static DEFINE_MUTEX(openprom_mutex); static struct device_node *options_node; /* @@ -222,7 +222,7 @@ static int opromnext(void __user *argp, unsigned int cmd, struct device_node *dp case OPROMSETCUR: default: break; - }; + } } else { /* Sibling of node zero is the root node. */ if (cmd != OPROMNEXT) @@ -316,7 +316,7 @@ static long openprom_sunos_ioctl(struct file * file, if (bufsize < 0) return bufsize; - lock_kernel(); + mutex_lock(&openprom_mutex); switch (cmd) { case OPROMGETOPT: @@ -367,7 +367,7 @@ static long openprom_sunos_ioctl(struct file * file, } kfree(opp); - unlock_kernel(); + mutex_unlock(&openprom_mutex); return error; } @@ -558,7 +558,7 @@ static int openprom_bsd_ioctl(struct file * file, void __user *argp = (void __user *)arg; int err; - lock_kernel(); + mutex_lock(&openprom_mutex); switch (cmd) { case OPIOCGET: err = opiocget(argp, data); @@ -588,8 +588,8 @@ static int openprom_bsd_ioctl(struct file * file, default: err = -EINVAL; break; - }; - unlock_kernel(); + } + mutex_unlock(&openprom_mutex); return err; } @@ -697,11 +697,11 @@ static int openprom_open(struct inode * inode, struct file * file) if (!data) return -ENOMEM; - lock_kernel(); + mutex_lock(&openprom_mutex); data->current_node = of_find_node_by_path("/"); data->lastnode = data->current_node; file->private_data = (void *) data; - unlock_kernel(); + mutex_unlock(&openprom_mutex); return 0; } |