Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5490fa96 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by H. Peter Anvin
Browse files

x86, mce: use round_jiffies() instead round_jiffies_relative() 



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: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 73af76df

arch/x86/kernel/cpu/mcheck/mce_64.c

+2 −2
Original line number Diff line number Diff line
@@ -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;