ipmi_msghandler: Change the events lock to a mutex

It can only be called from thread context now.

Signed-off-by: Corey Minyard <cminyard@mvista.com>

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index f5e58533ca7a03a05fe06208c1ff440262c38721..0b2d56704411a2a49ce932bb0b098418bd077cc9 100644 (file)
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -528,7 +528,7 @@ struct ipmi_smi {
         * Events that were queues because no one was there to receive
         * them.
         */
-       spinlock_t       events_lock; /* For dealing with event stuff. */
+       struct mutex     events_mutex; /* For dealing with event stuff. */
        struct list_head waiting_events;
        unsigned int     waiting_events_count; /* How many events in queue? */
        char             event_msg_printed;
@@ -1594,7 +1594,6 @@ EXPORT_SYMBOL(ipmi_set_maintenance_mode);
 
 int ipmi_set_gets_events(struct ipmi_user *user, bool val)
 {
-       unsigned long        flags;
        struct ipmi_smi      *intf = user->intf;
        struct ipmi_recv_msg *msg, *msg2;
        struct list_head     msgs;
@@ -1606,7 +1605,7 @@ int ipmi_set_gets_events(struct ipmi_user *user, bool val)
 
        INIT_LIST_HEAD(&msgs);
 
-       spin_lock_irqsave(&intf->events_lock, flags);
+       mutex_lock(&intf->events_mutex);
        if (user->gets_events == val)
                goto out;
 
@@ -1637,7 +1636,7 @@ int ipmi_set_gets_events(struct ipmi_user *user, bool val)
        }
 
  out:
-       spin_unlock_irqrestore(&intf->events_lock, flags);
+       mutex_unlock(&intf->events_mutex);
        release_ipmi_user(user, index);
 
        return 0;
@@ -3605,7 +3604,7 @@ int ipmi_add_smi(struct module         *owner,
        spin_lock_init(&intf->xmit_msgs_lock);
        INIT_LIST_HEAD(&intf->xmit_msgs);
        INIT_LIST_HEAD(&intf->hp_xmit_msgs);
-       spin_lock_init(&intf->events_lock);
+       mutex_init(&intf->events_mutex);
        spin_lock_init(&intf->watch_lock);
        atomic_set(&intf->event_waiters, 0);
        intf->ticks_to_req_ev = IPMI_REQUEST_EV_TIME;
@@ -4391,7 +4390,6 @@ static int handle_read_event_rsp(struct ipmi_smi *intf,
        struct list_head     msgs;
        struct ipmi_user     *user;
        int rv = 0, deliver_count = 0, index;
-       unsigned long        flags;
 
        if (msg->rsp_size < 19) {
                /* Message is too small to be an IPMB event. */
@@ -4406,7 +4404,7 @@ static int handle_read_event_rsp(struct ipmi_smi *intf,
 
        INIT_LIST_HEAD(&msgs);
 
-       spin_lock_irqsave(&intf->events_lock, flags);
+       mutex_lock(&intf->events_mutex);
 
        ipmi_inc_stat(intf, events);
 
@@ -4481,7 +4479,7 @@ static int handle_read_event_rsp(struct ipmi_smi *intf,
        }
 
  out:
-       spin_unlock_irqrestore(&intf->events_lock, flags);
+       mutex_unlock(&intf->events_mutex);
 
        return rv;
 }