diff --git a/[refs] b/[refs]
index 07f429e916b5..db6be7ec524a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80b7706e4cbaa51d65bd6fea83bd0e59856f50e9
+refs/heads/master: 5008fdf5b6a31240da060c0867d8f16f08ce2384
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
index b7e1410e4007..c9b700d87801 100644
--- a/trunk/drivers/kvm/svm.c
+++ b/trunk/drivers/kvm/svm.c
@@ -63,9 +63,9 @@ struct kvm_ldttss_desc {
 struct svm_cpu_data {
 	int cpu;
 
-	uint64_t asid_generation;
-	uint32_t max_asid;
-	uint32_t next_asid;
+	u64 asid_generation;
+	u32 max_asid;
+	u32 next_asid;
 	struct kvm_ldttss_desc *tss_desc;
 
 	struct page *save_area;