Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[mv-sheeva.git] / arch / cris / arch-v10 / drivers / sync_serial.c

diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index 109dcd826d171cac5d3fcf31228ab7230f057f1a..399dc1ec8e6fe3c4e1ac5d3bd89bd0537a57a490 100644 (file)
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -20,7 +20,7 @@
 #include <linux/interrupt.h>
 #include <linux/poll.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <asm/irq.h>
 #include <asm/dma.h>
@@ -149,6 +149,7 @@ struct sync_port {
 };
 
 
+static DEFINE_MUTEX(sync_serial_mutex);
 static int etrax_sync_serial_init(void);
 static void initialize_port(int portnbr);
 static inline int sync_data_avail(struct sync_port *port);
@@ -157,7 +158,7 @@ static int sync_serial_open(struct inode *inode, struct file *file);
 static int sync_serial_release(struct inode *inode, struct file *file);
 static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);
 
-static int sync_serial_ioctl(struct inode *inode, struct file *file,
+static int sync_serial_ioctl(struct file *file,
        unsigned int cmd, unsigned long arg);
 static ssize_t sync_serial_write(struct file *file, const char *buf,
        size_t count, loff_t *ppos);
@@ -244,13 +245,14 @@ static unsigned sync_serial_prescale_shadow;
 #define NUMBER_OF_PORTS 2
 
 static const struct file_operations sync_serial_fops = {
-       .owner   = THIS_MODULE,
-       .write   = sync_serial_write,
-       .read    = sync_serial_read,
-       .poll    = sync_serial_poll,
-       .ioctl   = sync_serial_ioctl,
-       .open    = sync_serial_open,
-       .release = sync_serial_release
+       .owner          = THIS_MODULE,
+       .write          = sync_serial_write,
+       .read           = sync_serial_read,
+       .poll           = sync_serial_poll,
+       .unlocked_ioctl = sync_serial_ioctl,
+       .open           = sync_serial_open,
+       .release        = sync_serial_release,
+       .llseek         = noop_llseek,
 };
 
 static int __init etrax_sync_serial_init(void)
@@ -445,7 +447,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
        int mode;
        int err = -EBUSY;
 
-       lock_kernel();
+       mutex_lock(&sync_serial_mutex);
        DEBUG(printk(KERN_DEBUG "Open sync serial port %d\n", dev));
 
        if (dev < 0 || dev >= NUMBER_OF_PORTS || !ports[dev].enabled) {
@@ -626,7 +628,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)
        ret = 0;
        
 out:
-       unlock_kernel();
+       mutex_unlock(&sync_serial_mutex);
        return ret;
 }
 
@@ -678,7 +680,7 @@ static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
        return mask;
 }
 
-static int sync_serial_ioctl(struct inode *inode, struct file *file,
+static int sync_serial_ioctl_unlocked(struct file *file,
                  unsigned int cmd, unsigned long arg)
 {
        int return_val = 0;
@@ -956,6 +958,18 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
        return return_val;
 }
 
+static long sync_serial_ioctl(struct file *file,
+                             unsigned int cmd, unsigned long arg)
+{
+       long ret;
+
+       mutex_lock(&sync_serial_mutex);
+       ret = sync_serial_ioctl_unlocked(file, cmd, arg);
+       mutex_unlock(&sync_serial_mutex);
+
+       return ret;
+}
+
 
 static ssize_t sync_serial_write(struct file *file, const char *buf,
        size_t count, loff_t *ppos)