diff options
| author | Avi Kivity <avi@redhat.com> | 2009-08-06 14:40:00 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-08 20:17:20 -0700 |
| commit | f06f0605b998dfe1453380bfff72bd861ca3a016 (patch) | |
| tree | 96f2280838f3c1143e90567fa8585260200ac9ec | |
| parent | 9d978f7cf24e6451af158eb5da483193010c10f0 (diff) | |
KVM: Make EFER reads safe when EFER does not exist
(cherry picked from commit e286e86e6d2042d67d09244aa0e05ffef75c9d54)
Some processors don't have EFER; don't oops if userspace wants us to
read EFER when we check NX.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 1454992e6ac..662cf12d1db 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -983,9 +983,9 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) static int is_efer_nx(void) { - u64 efer; + unsigned long long efer = 0; - rdmsrl(MSR_EFER, efer); + rdmsrl_safe(MSR_EFER, &efer); return efer & EFER_NX; } |