]>
Commit | Line | Data |
---|---|---|
00e5a55c BS |
1 | From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> |
2 | Date: Wed, 11 Mar 2009 01:14:26 +0000 (+0900) | |
3 | Subject: x86, mce: use round_jiffies() instead round_jiffies_relative() | |
4 | Patch-mainline: 2.6.30-rc3 | |
5 | Git-commit: 5490fa96735ce0e2af270c0868987d644b9a38ec | |
6 | References: bnc#507557 | |
7 | ||
8 | x86, mce: use round_jiffies() instead round_jiffies_relative() | |
9 | ||
10 | Impact: saving power _very_ little | |
11 | ||
12 | round_jiffies() round up absolute jiffies to full second. | |
13 | round_jiffies_relative() round up relative jiffies to full second. | |
14 | ||
15 | The "t->expires" is absolute jiffies. Then, round_jiffies() should be | |
16 | used instead round_jiffies_relative(). | |
17 | ||
18 | Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | |
19 | Cc: Andi Kleen <andi@firstfloor.org> | |
20 | Cc: H. Peter Anvin <hpa@linux.intel.com> | |
21 | Signed-off-by: H. Peter Anvin <hpa@zytor.com> | |
22 | Acked-by: Jeff Mahoney <jeffm@suse.com> | |
23 | ||
24 | --- | |
25 | arch/x86/kernel/cpu/mcheck/mce_64.c | 4 ++-- | |
26 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
27 | ||
28 | --- a/arch/x86/kernel/cpu/mcheck/mce_64.c | |
29 | +++ b/arch/x86/kernel/cpu/mcheck/mce_64.c | |
30 | @@ -509,7 +509,7 @@ static void mce_init_timer(void) | |
31 | if (!next_interval) | |
32 | return; | |
33 | setup_timer(t, mcheck_timer, smp_processor_id()); | |
34 | - t->expires = round_jiffies_relative(jiffies + next_interval); | |
35 | + t->expires = round_jiffies(jiffies + next_interval); | |
36 | add_timer(t); | |
37 | } | |
38 | ||
39 | @@ -912,7 +912,7 @@ static int __cpuinit mce_cpu_callback(st | |
40 | break; | |
41 | case CPU_DOWN_FAILED: | |
42 | case CPU_DOWN_FAILED_FROZEN: | |
43 | - t->expires = round_jiffies_relative(jiffies + next_interval); | |
44 | + t->expires = round_jiffies(jiffies + next_interval); | |
45 | add_timer_on(t, cpu); | |
46 | break; | |
47 | } |