diff options
| author | Peter Zijlstra <[email protected]> | 2010-09-10 22:32:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2010-09-11 09:47:07 +0200 |
| commit | 55496c896b8a695140045099d4e0175cf09d4eae (patch) | |
| tree | e15f111e36dde1d8a452a55db005fb4b1dc0ac5f | |
| parent | da2b71edd8a7db44fe1746261410a981f3e03632 (diff) | |
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
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]>
Cc: <[email protected]> # Greg, please apply after: cd7240c ("x86, tsc, sched: Recompute cyc2ns_offset's during resume from")
sleep states
LKML-Reference: <1284150773.402.122.camel@laptop>
Signed-off-by: Ingo Molnar <[email protected]>
| -rw-r--r-- | 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 d632934cb638..26a863a9c2a8 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) |