From 6062e062ce2eeebb1bd70a9558d7ac8c2075eac3 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 7 Feb 2008 13:47:38 +0100
Subject: [PATCH] --- yaml --- r: 93785 b: refs/heads/master c:
 33bd6a0b3e8baed6469c8e68ea1b16cb50c4f5af h: refs/heads/master i:   93783:
 44c114dbb6c6cb959fb40bb84231c018a9ab3612 v: v3

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

diff --git a/[refs] b/[refs]
index 6d635bf43d8d..47d36fdc1988 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9457a712a2f464c4b21bb7f78998775c69673a0c
+refs/heads/master: 33bd6a0b3e8baed6469c8e68ea1b16cb50c4f5af
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index ff3bc74af728..5f527dc0e162 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -302,7 +302,6 @@ static void svm_hardware_enable(void *garbage)
 	svm_data->asid_generation = 1;
 	svm_data->max_asid = cpuid_ebx(SVM_CPUID_FUNC) - 1;
 	svm_data->next_asid = svm_data->max_asid + 1;
-	svm_features = cpuid_edx(SVM_CPUID_FUNC);
 
 	asm volatile ("sgdt %0" : "=m"(gdt_descr));
 	gdt = (struct desc_struct *)gdt_descr.address;
@@ -411,6 +410,9 @@ static __init int svm_hardware_setup(void)
 		if (r)
 			goto err_2;
 	}
+
+	svm_features = cpuid_edx(SVM_CPUID_FUNC);
+
 	return 0;
 
 err_2: