]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
committerIngo Molnar <mingo@kernel.org>
Wed, 6 Jun 2012 06:28:21 +0000 (08:28 +0200)
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>
Cc: bp@amd64.org
Cc: tony.luck@intel.com
Link: http://lkml.kernel.org/r/1338863702-9245-1-git-send-email-gong.chen@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/mcheck/mce.c

index 0a687fd185e6c97b496578d1dc6acb4001c2833d..a97f3c4a3946b7e7d3b8be67129a33166ab2b61c 100644 (file)
@@ -1274,7 +1274,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);