3 files changed, 17 insertions, 86 deletions

diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
index 23028559dbc4..ad26f4b997c5 100644
--- a/drivers/char/ipmi/ipmi_msghandler.c
+++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -57,8 +57,7 @@ static int ipmi_init_msghandler(void);
 static int initialized = 0;
 
 #ifdef CONFIG_PROC_FS
-struct proc_dir_entry *proc_ipmi_root = NULL;
-EXPORT_SYMBOL(proc_ipmi_root);
+static struct proc_dir_entry *proc_ipmi_root = NULL;
 #endif /* CONFIG_PROC_FS */
 
 #define MAX_EVENTS_IN_QUEUE     25
@@ -3674,7 +3673,7 @@ static void send_panic_events(char *str)
 }
 #endif /* CONFIG_IPMI_PANIC_EVENT */
 
-static int has_paniced = 0;
+static int has_panicked = 0;
 
 static int panic_event(struct notifier_block *this,
                        unsigned long         event,
@@ -3683,9 +3682,9 @@ static int panic_event(struct notifier_block *this,
         int        i;
         ipmi_smi_t intf;
 
-        if (has_paniced)
+        if (has_panicked)
                 return NOTIFY_DONE;
-        has_paniced = 1;
+        has_panicked = 1;
 
         /* For every registered interface, set it to run to completion. */
         for (i = 0; i < MAX_IPMI_INTERFACES; i++) {
@@ -3739,11 +3738,8 @@ static int ipmi_init_msghandler(void)
         proc_ipmi_root->owner = THIS_MODULE;
 #endif /* CONFIG_PROC_FS */
 
-        init_timer(&ipmi_timer);
-        ipmi_timer.data = 0;
-        ipmi_timer.function = ipmi_timeout;
-        ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES;
-        add_timer(&ipmi_timer);
+        setup_timer(&ipmi_timer, ipmi_timeout, 0);
+        mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES);
 
         atomic_notifier_chain_register(&panic_notifier_list, &panic_block);
 
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 02a7dd7a8a55..bd4f2248b758 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -55,23 +55,6 @@
 #include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <asm/irq.h>
-#ifdef CONFIG_HIGH_RES_TIMERS
-#include <linux/hrtime.h>
-# if defined(schedule_next_int)
-/* Old high-res timer code, do translations. */
-#  define get_arch_cycles(a) quick_update_jiffies_sub(a)
-#  define arch_cycles_per_jiffy cycles_per_jiffies
-# endif
-static inline void add_usec_to_timer(struct timer_list *t, long v)
-{
-        t->arch_cycle_expires += nsec_to_arch_cycle(v * 1000);
-        while (t->arch_cycle_expires >= arch_cycles_per_jiffy)
-        {
-                t->expires++;
-                t->arch_cycle_expires -= arch_cycles_per_jiffy;
-        }
-}
-#endif
 #include <linux/interrupt.h>
 #include <linux/rcupdate.h>
 #include <linux/ipmi_smi.h>
@@ -243,8 +226,6 @@ static int register_xaction_notifier(struct notifier_block * nb)
         return atomic_notifier_chain_register(&xaction_notifier_list, nb);
 }
 
-static void si_restart_short_timer(struct smi_info *smi_info);
-
 static void deliver_recv_msg(struct smi_info *smi_info,
                              struct ipmi_smi_msg *msg)
 {
@@ -768,7 +749,6 @@ static void sender(void                *send_info,
             && (smi_info->curr_msg == NULL))
         {
                 start_next_msg(smi_info);
-                si_restart_short_timer(smi_info);
         }
         spin_unlock_irqrestore(&(smi_info->si_lock), flags);
 }
@@ -809,7 +789,7 @@ static int ipmi_thread(void *data)
                         /* do nothing */
                 }
                 else if (smi_result == SI_SM_CALL_WITH_DELAY)
-                        udelay(1);
+                        schedule();
                 else
                         schedule_timeout_interruptible(1);
         }
@@ -833,37 +813,6 @@ static void request_events(void *send_info)
 
 static int initialized = 0;
 
-/* Must be called with interrupts off and with the si_lock held. */
-static void si_restart_short_timer(struct smi_info *smi_info)
-{
-#if defined(CONFIG_HIGH_RES_TIMERS)
-        unsigned long flags;
-        unsigned long jiffies_now;
-        unsigned long seq;
-
-        if (del_timer(&(smi_info->si_timer))) {
-                /* If we don't delete the timer, then it will go off
-                   immediately, anyway.  So we only process if we
-                   actually delete the timer. */
-
-                do {
-                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
-                        jiffies_now = jiffies;
-                        smi_info->si_timer.expires = jiffies_now;
-                        smi_info->si_timer.arch_cycle_expires
-                                = get_arch_cycles(jiffies_now);
-                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-
-                add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
-
-                add_timer(&(smi_info->si_timer));
-                spin_lock_irqsave(&smi_info->count_lock, flags);
-                smi_info->timeout_restarts++;
-                spin_unlock_irqrestore(&smi_info->count_lock, flags);
-        }
-#endif
-}
-
 static void smi_timeout(unsigned long data)
 {
         struct smi_info   *smi_info = (struct smi_info *) data;
@@ -904,31 +853,15 @@ static void smi_timeout(unsigned long data)
         /* If the state machine asks for a short delay, then shorten
            the timer timeout. */
         if (smi_result == SI_SM_CALL_WITH_DELAY) {
-#if defined(CONFIG_HIGH_RES_TIMERS)
-                unsigned long seq;
-#endif
                 spin_lock_irqsave(&smi_info->count_lock, flags);
                 smi_info->short_timeouts++;
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
-#if defined(CONFIG_HIGH_RES_TIMERS)
-                do {
-                        seq = read_seqbegin_irqsave(&xtime_lock, flags);
-                        smi_info->si_timer.expires = jiffies;
-                        smi_info->si_timer.arch_cycle_expires
-                                = get_arch_cycles(smi_info->si_timer.expires);
-                } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
-                add_usec_to_timer(&smi_info->si_timer, SI_SHORT_TIMEOUT_USEC);
-#else
                 smi_info->si_timer.expires = jiffies + 1;
-#endif
         } else {
                 spin_lock_irqsave(&smi_info->count_lock, flags);
                 smi_info->long_timeouts++;
                 spin_unlock_irqrestore(&smi_info->count_lock, flags);
                 smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES;
-#if defined(CONFIG_HIGH_RES_TIMERS)
-                smi_info->si_timer.arch_cycle_expires = 0;
-#endif
         }
 
  do_add_timer:
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 8f8867170973..1a0a19c53605 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -949,9 +949,10 @@ static int wdog_reboot_handler(struct notifier_block *this,
                         /* Disable the WDT if we are shutting down. */
                         ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
                         panic_halt_ipmi_set_timeout();
-                } else {
+                } else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {
                         /* Set a long timer to let the reboot happens, but
-                           reboot if it hangs. */
+                           reboot if it hangs, but only if the watchdog
+                           timer was already running. */
                         timeout = 120;
                         pretimeout = 0;
                         ipmi_watchdog_state = WDOG_TIMEOUT_RESET;
@@ -973,16 +974,17 @@ static int wdog_panic_handler(struct notifier_block *this,
 {
         static int panic_event_handled = 0;
 
-        /* On a panic, if we have a panic timeout, make sure that the thing
-           reboots, even if it hangs during that panic. */
-        if (watchdog_user && !panic_event_handled) {
-                /* Make sure the panic doesn't hang, and make sure we
-                   do this only once. */
+        /* On a panic, if we have a panic timeout, make sure to extend
+           the watchdog timer to a reasonable value to complete the
+           panic, if the watchdog timer is running.  Plus the
+           pretimeout is meaningless at panic time. */
+        if (watchdog_user && !panic_event_handled &&
+            ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {
+                /* Make sure we do this only once. */
                 panic_event_handled = 1;
             
                 timeout = 255;
                 pretimeout = 0;
-                ipmi_watchdog_state = WDOG_TIMEOUT_RESET;
                 panic_halt_ipmi_set_timeout();
         }