diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2010-09-10 22:32:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 03:17:45 +0200 |
| commit | 5ee5e97ee9bca919af11c562beeaf61741ad33f1 (patch) | |
| tree | 1456b2d8a8adcebe63dba1dd9f0c849d0349b5fb /arch/x86/kernel/tsc.c | |
| parent | execve: make responsive to SIGKILL with large arguments (diff) | |
| download | linux-5ee5e97ee9bca919af11c562beeaf61741ad33f1.tar.xz linux-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>
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -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) |