projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
914ebcc
)
KVM: kvm_pdptr_read() may sleep
author
Avi Kivity
<avi@redhat.com>
Tue, 4 May 2010 10:00:55 +0000
(13:00 +0300)
committer
Avi Kivity
<avi@redhat.com>
Sun, 1 Aug 2010 07:35:27 +0000
(10:35 +0300)
Annotate it thusly.
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/kvm_cache_regs.h
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/kvm_cache_regs.h
b/arch/x86/kvm/kvm_cache_regs.h
index
cff851c
..
d2a98f8
100644
(file)
--- 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);