This reverts commit 9fe573d539a827d123ba7503cc8ac2301424d26b which is
commit b7031fd4 upstream.

It should not have been selected for a stable kernel as it breaks the
nVMX regression tests.
Reported-by: NJack Wang <jack.wang.usish@gmail.com>
Reported-by: NPaolo Bonzini <pbonzini@redhat.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Cc: Jim Mattson <jmattson@google.com>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>