kvm: x86: Fix merge artifact of f8d926e9 about mp_state
commit5a2e3c2e11802215cbb69d6e5ad35b5bdc7d5382
authorJan Kiszka <jan.kiszka@web.de>
Tue, 24 Nov 2009 23:31:03 +0000 (25 00:31 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 3 Dec 2009 21:25:56 +0000 (3 15:25 -0600)
treeab55e1c3f765bdabd86edea0f65d5cce47109405
parentdc702288a3604ce8f788a5b9c7a19fad6d1aa50b
kvm: x86: Fix merge artifact of f8d926e9 about mp_state

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
target-i386/kvm.c