From: Peter Zijlstra <[email protected]> commit 55496c896b8a695140045099d4e0175cf09d4eae upstream.
Doh, a real life genuine preemption leak.. This caused a suspend failure. Reported-bisected-and-tested-by-the-invaluable: Jeff Chua <[email protected]> Acked-by: Suresh Siddha <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Nico Schottelius <[email protected]> Cc: Jesse Barnes <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Florian Pritz <[email protected]> Cc: Suresh Siddha <[email protected]> Cc: Len Brown <[email protected]> sleep states LKML-Reference: <1284150773.402.122.ca...@laptop> Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Paul Gortmaker <[email protected]> --- arch/x86/kernel/tsc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index c65f741..4094ae0 100644 --- a/arch/x86/kernel/tsc.c +++ b/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) -- 1.7.3.3 _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
