Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable

[pandora-kernel.git] / drivers / char / ipmi / ipmi_devintf.c

diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index d8ec92a..1fc8876 100644 (file)
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -44,7 +44,6 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/compat.h>
-#include <linux/smp_lock.h>
 
 struct ipmi_file_private
 {
@@ -59,6 +58,7 @@ struct ipmi_file_private
        unsigned int         default_retry_time_ms;
 };
 
+static DEFINE_MUTEX(ipmi_mutex);
 static void file_receive_handler(struct ipmi_recv_msg *msg,
                                 void                 *handler_data)
 {
@@ -102,9 +102,9 @@ static int ipmi_fasync(int fd, struct file *file, int on)
        struct ipmi_file_private *priv = file->private_data;
        int                      result;
 
-       lock_kernel(); /* could race against open() otherwise */
+       mutex_lock(&ipmi_mutex); /* could race against open() otherwise */
        result = fasync_helper(fd, file, on, &priv->fasync_queue);
-       unlock_kernel();
+       mutex_unlock(&ipmi_mutex);
 
        return (result);
 }
@@ -125,7 +125,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
        if (!priv)
                return -ENOMEM;
 
-       lock_kernel();
+       mutex_lock(&ipmi_mutex);
        priv->file = file;
 
        rv = ipmi_create_user(if_num,
@@ -150,7 +150,7 @@ static int ipmi_open(struct inode *inode, struct file *file)
        priv->default_retry_time_ms = 0;
 
 out:
-       unlock_kernel();
+       mutex_unlock(&ipmi_mutex);
        return rv;
 }
 
@@ -639,9 +639,9 @@ static long ipmi_unlocked_ioctl(struct file   *file,
 {
        int ret;
 
-       lock_kernel();
+       mutex_lock(&ipmi_mutex);
        ret = ipmi_ioctl(file, cmd, data);
-       unlock_kernel();
+       mutex_unlock(&ipmi_mutex);
 
        return ret;
 }
@@ -850,6 +850,7 @@ static const struct file_operations ipmi_fops = {
        .release        = ipmi_release,
        .fasync         = ipmi_fasync,
        .poll           = ipmi_poll,
+       .llseek         = noop_llseek,
 };
 
 #define DEVICE_NAME     "ipmidev"