restore_sched_clock_state methods use percpu data, therefore they must run after %gs is initialized, but before mtrr_bp_restore (due to lockstat using sched_clock).
Move it to the correct place. Signed-off-by: Marcelo Tosatti <[email protected]> diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 0e76a28..0f405d9 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c @@ -224,13 +224,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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
