diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-04-01 13:53:36 -0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-04-02 13:53:00 +0200 |
| commit | dba69d1092e291e257fb5673a3ad0e4c87878ebc (patch) | |
| tree | 9094d916ec45ec61d4014bc160f6314823ce3a7c /arch/x86 | |
| parent | c0e9afc0da6cb0f11497e5ea83377b3c451450e0 (diff) | |
| download | blackbird-op-linux-dba69d1092e291e257fb5673a3ad0e4c87878ebc.tar.gz blackbird-op-linux-dba69d1092e291e257fb5673a3ad0e4c87878ebc.zip | |
x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
s2ram broke due to this KVM commit:
b74f05d61b73 x86: kvmclock: abstract save/restore sched_clock_state
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.
Reported-and-tested-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/power/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index 47936830968c..218cdb16163c 100644 --- a/arch/x86/power/cpu.c +++ b/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 |
