x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
authorMarcelo Tosatti <mtosatti@redhat.com>
Sun, 1 Apr 2012 16:53:36 +0000 (13:53 -0300)
committerIngo Molnar <mingo@kernel.org>
Mon, 2 Apr 2012 11:53:00 +0000 (13:53 +0200)
commitdba69d1092e291e257fb5673a3ad0e4c87878ebc
tree9094d916ec45ec61d4014bc160f6314823ce3a7c
parentc0e9afc0da6cb0f11497e5ea83377b3c451450e0
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>
arch/x86/power/cpu.c