[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100918191305.818336224@clark.site>
Date: Sat, 18 Sep 2010 12:13:17 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Suresh Siddha <suresh.b.siddha@...el.com>,
Peter Zijlstra <a.p.zijlstra@...llo.nl>,
"Rafael J. Wysocki" <rjw@...k.pl>,
Nico Schottelius <nico-linux-20100709@...ottelius.org>,
Jesse Barnes <jbarnes@...tuousgeek.org>,
Florian Pritz <flo@...n.at>, Len Brown <lenb@...nel.org>,
Ingo Molnar <mingo@...e.hu>
Subject: [099/129] x86, tsc: Fix a preemption leak in restore_sched_clock_state()
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Peter Zijlstra <peterz@...radead.org>
commit 55496c896b8a695140045099d4e0175cf09d4eae upstream.
Doh, a real life genuine preemption leak..
This caused a suspend failure.
Reported-bisected-and-tested-by-the-invaluable: Jeff Chua <jeff.chua.linux@...il.com>
Acked-by: Suresh Siddha <suresh.b.siddha@...el.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Rafael J. Wysocki <rjw@...k.pl>
Cc: Nico Schottelius <nico-linux-20100709@...ottelius.org>
Cc: Jesse Barnes <jbarnes@...tuousgeek.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Florian Pritz <flo@...n.at>
Cc: Suresh Siddha <suresh.b.siddha@...el.com>
Cc: Len Brown <lenb@...nel.org>
sleep states
LKML-Reference: <1284150773.402.122.camel@...top>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
arch/x86/kernel/tsc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- 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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists