summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/kvm_cache_regs.h
diff options
context:
space:
mode:
authorAvi Kivity2010-05-04 12:00:55 +0200
committerAvi Kivity2010-08-01 09:35:27 +0200
commit08acfa187117046f8b5044b4a4cdc910f3ceeeb5 (patch)
tree7a5eb2d66135827c99cb47446cd7580334de5d14 /arch/x86/kvm/kvm_cache_regs.h
parentKVM: x86: avoid unnecessary bitmap allocation when memslot is clean (diff)
downloadkernel-qcow2-linux-08acfa187117046f8b5044b4a4cdc910f3ceeeb5.tar.gz
kernel-qcow2-linux-08acfa187117046f8b5044b4a4cdc910f3ceeeb5.tar.xz
kernel-qcow2-linux-08acfa187117046f8b5044b4a4cdc910f3ceeeb5.zip
KVM: kvm_pdptr_read() may sleep
Annotate it thusly. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/kvm_cache_regs.h')
-rw-r--r--arch/x86/kvm/kvm_cache_regs.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/kvm_cache_regs.h b/arch/x86/kvm/kvm_cache_regs.h
index cff851cf5322..d2a98f8f9af5 100644
--- a/arch/x86/kvm/kvm_cache_regs.h
+++ b/arch/x86/kvm/kvm_cache_regs.h
@@ -36,6 +36,8 @@ static inline void kvm_rip_write(struct kvm_vcpu *vcpu, unsigned long val)
static inline u64 kvm_pdptr_read(struct kvm_vcpu *vcpu, int index)
{
+ might_sleep(); /* on svm */
+
if (!test_bit(VCPU_EXREG_PDPTR,
(unsigned long *)&vcpu->arch.regs_avail))
kvm_x86_ops->cache_reg(vcpu, VCPU_EXREG_PDPTR);