x86/mce: Fix the MCE poll timer logic
authorChen Gong <gong.chen@linux.intel.com>
Tue, 5 Jun 2012 02:35:02 +0000 (10:35 +0800)
committerTony Luck <tony.luck@intel.com>
Tue, 5 Jun 2012 17:15:07 +0000 (10:15 -0700)
In commit 82f7af09 (x86/mce: Cleanup timer mess), Thomas just forgot
the "/ 2" there while cleaning up.

Signed-off-by: Chen Gong <gong.chen@linux.intel.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/x86/kernel/cpu/mcheck/mce.c

index 98003bfc5556c70ee03f679a7f1d6264ee4bfa30..d6b18a4d0b95559c8cc66c008bfa47b548dad374 100644 (file)
@@ -1266,7 +1266,7 @@ static void mce_timer_fn(unsigned long data)
         */
        iv = __this_cpu_read(mce_next_interval);
        if (mce_notify_irq())
-               iv = max(iv, (unsigned long) HZ/100);
+               iv = max(iv / 2, (unsigned long) HZ/100);
        else
                iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));
        __this_cpu_write(mce_next_interval, iv);