From d99628c5e917fafe9f826926ddfe25aeaf9d9617 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 3 May 2009 18:50:55 +0300
Subject: [PATCH] --- yaml --- r: 144908 b: refs/heads/master c:
 e286e86e6d2042d67d09244aa0e05ffef75c9d54 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 549ae307b54d..f7e013515af7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 334b8ad7b182fc14d720acd7729afda3ab4c7e3a
+refs/heads/master: e286e86e6d2042d67d09244aa0e05ffef75c9d54
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 834a7bf25e48..49079a46687b 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -1121,9 +1121,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;
 }