---

yaml --- r: 210564 b: refs/heads/master c: 55496c8 h: refs/heads/master v: v3
git-mirror · Sep 11, 2010 · 56fa472 · 56fa472
1 parent 7884212
commit 56fa472
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: da2b71edd8a7db44fe1746261410a981f3e03632
+refs/heads/master: 55496c896b8a695140045099d4e0175cf09d4eae
diff --git a/trunk/arch/x86/kernel/tsc.c b/trunk/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)