x86, mce: use round_jiffies() instead round_jiffies_relative()
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Wed, 11 Mar 2009 01:14:26 +0000 (10:14 +0900)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 11 Mar 2009 05:33:06 +0000 (22:33 -0700)
Impact: saving power _very_ little

round_jiffies() round up absolute jiffies to full second.
round_jiffies_relative() round up relative jiffies to full second.

The "t->expires" is absolute jiffies. Then, round_jiffies() should be
used instead round_jiffies_relative().

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
arch/x86/kernel/cpu/mcheck/mce_64.c

index bfbd5323a63538bebed231801cbe22f6c5acfd26..ca14604611ec7ccc6217afc008e50d88af6ad88f 100644 (file)
@@ -639,7 +639,7 @@ static void mce_init_timer(void)
        if (!next_interval)
                return;
        setup_timer(t, mcheck_timer, smp_processor_id());
-       t->expires = round_jiffies_relative(jiffies + next_interval);
+       t->expires = round_jiffies(jiffies + next_interval);
        add_timer(t);
 }
 
@@ -1110,7 +1110,7 @@ static int __cpuinit mce_cpu_callback(struct notifier_block *nfb,
                break;
        case CPU_DOWN_FAILED:
        case CPU_DOWN_FAILED_FROZEN:
-               t->expires = round_jiffies_relative(jiffies + next_interval);
+               t->expires = round_jiffies(jiffies + next_interval);
                add_timer_on(t, cpu);
                smp_call_function_single(cpu, mce_reenable_cpu, &action, 1);
                break;