---

yaml --- r: 298570 b: refs/heads/master c: dba69d1 h: refs/heads/master v: v3
git-mirror · Apr 2, 2012 · 4a15b3e · 4a15b3e
1 parent e1b6a7c
commit 4a15b3e
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: c0e9afc0da6cb0f11497e5ea83377b3c451450e0
+refs/heads/master: dba69d1092e291e257fb5673a3ad0e4c87878ebc
diff --git a/trunk/arch/x86/power/cpu.c b/trunk/arch/x86/power/cpu.c
@@ -225,13 +225,13 @@ static void __restore_processor_state(struct saved_context *ctxt)
 	fix_processor_context();
 
 	do_fpu_end();
+	x86_platform.restore_sched_clock_state();
 	mtrr_bp_restore();
 }
 
 /* Needed by apm.c */
 void restore_processor_state(void)
 {
-	x86_platform.restore_sched_clock_state();
 	__restore_processor_state(&saved_context);
 }
 #ifdef CONFIG_X86_32