Minor IPMI fixes

• Next message: Randy.Dunlap: "Re: 2.5.67-mm1 cause framebuffer crash at bootup"
• Previous message: Steven Cole: "Re: 2.5.67, 2.5-bk lock up with RH 9 and graphical log out."
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

The attached patch fixes a few minor problems with the IPMI driver, a
misplaced lock, a wrong semphore type, and a few errors in certain
configurations. This is relative to 2.5.67.

Linus, please apply.

Thanks,

-Corey

diff -ur linux.orig/drivers/char/ipmi/ipmi_devintf.c linux-main/drivers/char/ipmi/ipmi_devintf.c
--- linux.orig/drivers/char/ipmi/ipmi_devintf.c Mon Apr 7 15:55:43 2003
+++ linux-main/drivers/char/ipmi/ipmi_devintf.c Thu Apr 3 12:32:28 2003
@@ -81,9 +81,9 @@
         unsigned int mask = 0;
         unsigned long flags;
 
- spin_lock_irqsave(&priv->recv_msg_lock, flags);
-
         poll_wait(file, &priv->wait, wait);
+
+ spin_lock_irqsave(&priv->recv_msg_lock, flags);
 
         if (! list_empty(&(priv->recv_msgs)))
                 mask |= (POLLIN | POLLRDNORM);
diff -ur linux.orig/drivers/char/ipmi/ipmi_watchdog.c linux-main/drivers/char/ipmi/ipmi_watchdog.c
--- linux.orig/drivers/char/ipmi/ipmi_watchdog.c Tue Jan 14 11:16:10 2003
+++ linux-main/drivers/char/ipmi/ipmi_watchdog.c Wed Apr 9 14:55:03 2003
@@ -751,7 +751,7 @@
 {
         int rv = -EBUSY;
 
- down_read(&register_sem);
+ down_write(&register_sem);
         if (watchdog_user)
                 goto out;
 
@@ -917,7 +917,7 @@
         } else if (strcmp(preaction, "pre_int") == 0) {
                 preaction_val = WDOG_PRETIMEOUT_MSG_INT;
         } else {
- action_val = WDOG_PRETIMEOUT_NONE;
+ preaction_val = WDOG_PRETIMEOUT_NONE;
                 printk("ipmi_watchdog: Unknown preaction '%s', defaulting to"
                        " none\n", preaction);
         }
@@ -929,7 +929,7 @@
         } else if (strcmp(preop, "preop_give_data") == 0) {
                 preop_val = WDOG_PREOP_GIVE_DATA;
         } else {
- action_val = WDOG_PREOP_NONE;
+ preop_val = WDOG_PREOP_NONE;
                 printk("ipmi_watchdog: Unknown preop '%s', defaulting to"
                        " none\n", preop);
         }

• application/pgp-signature attachment: stored

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Randy.Dunlap: "Re: 2.5.67-mm1 cause framebuffer crash at bootup"
• Previous message: Steven Cole: "Re: 2.5.67, 2.5-bk lock up with RH 9 and graphical log out."
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Tue Apr 15 2003 - 22:00:19 EST