---

yaml --- r: 210553 b: refs/heads/master c: 5ee5e97 h: refs/heads/master i: 210551: 0d57d2a v: v3
git-mirror · Sep 11, 2010 · c0761d0 · c0761d0
1 parent 9ca4a2d
commit c0761d0
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: 9aea5a65aa7a1af9a4236dfaeb0088f1624f9919
+refs/heads/master: 5ee5e97ee9bca919af11c562beeaf61741ad33f1
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)