From 56fa472ff37a154838746033491e4c84cc368024 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 10 Sep 2010 22:32:53 +0200 Subject: [PATCH] --- yaml --- r: 210564 b: refs/heads/master c: 55496c896b8a695140045099d4e0175cf09d4eae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/tsc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77cf5ad3d11b..2ac16eb3be1c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da2b71edd8a7db44fe1746261410a981f3e03632 +refs/heads/master: 55496c896b8a695140045099d4e0175cf09d4eae diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/arch/x86/kernel/tsc.c index d632934cb638..26a863a9c2a8 100644 --- a/trunk/arch/x86/kernel/tsc.c +++ b/trunk/arch/x86/kernel/tsc.c @@ -655,7 +655,7 @@ void restore_sched_clock_state(void) local_irq_save(flags); - get_cpu_var(cyc2ns_offset) = 0; + __get_cpu_var(cyc2ns_offset) = 0; offset = cyc2ns_suspend - sched_clock(); for_each_possible_cpu(cpu)