Skip to content
Commit dba69d10 authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Ingo Molnar
Browse files

x86, kvm: Call restore_sched_clock_state() only after %gs is initialized



s2ram broke due to this KVM commit:

  b74f05d6 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: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c0e9afc0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment