X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Ftsc.c;h=acb08dd7bb575367e50ca6af2d5b3d49c7118ce1;hb=0a3aee0da4402aa19b66e458038533c896fb80c6;hp=0c40d8b72416ba2ef7e86bfd812b7bf6f1db2f8f;hpb=7c83912062c801738d7d19acaf8f7fec25ea663c;p=deliverable%2Flinux.git diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 0c40d8b72416..acb08dd7bb57 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -659,7 +659,7 @@ void restore_sched_clock_state(void) local_irq_save(flags); - __get_cpu_var(cyc2ns_offset) = 0; + __this_cpu_write(cyc2ns_offset, 0); offset = cyc2ns_suspend - sched_clock(); for_each_possible_cpu(cpu)