diff --git a/[refs] b/[refs] index a20c2e621f5a..d29b1515e7f0 100644 --- 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 index 47936830968c..218cdb16163c 100644 --- 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