summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2010-09-10 22:32:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-10 18:17:45 -0700
commit5ee5e97ee9bca919af11c562beeaf61741ad33f1 (patch)
tree1456b2d8a8adcebe63dba1dd9f0c849d0349b5fb
parent9aea5a65aa7a1af9a4236dfaeb0088f1624f9919 (diff)
downloadlinux-3.10-5ee5e97ee9bca919af11c562beeaf61741ad33f1.tar.gz
linux-3.10-5ee5e97ee9bca919af11c562beeaf61741ad33f1.tar.bz2
linux-3.10-5ee5e97ee9bca919af11c562beeaf61741ad33f1.zip
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
A real life genuine preemption leak.. Reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Acked-by: Suresh Siddha <suresh.b.siddha@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/kernel/tsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index d632934cb63..26a863a9c2a 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)