From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Sun, 1 Apr 2012 16:53:36 +0000 (-0300)
Subject: x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
X-Git-Tag: v3.4-rc2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dba69d1092e291e257fb5673a3ad0e4c87878ebc;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed