diff --git a/[refs] b/[refs]
index 4ca68c1c82d4..dd6302b38582 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e778161fb4612d2ceac9604f10e1061f5f4cf48
+refs/heads/master: 33f5fa1664046208b890e9231a47e377fdfc7762
diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
index cd999c0a24c4..b40066854c14 100644
--- a/trunk/drivers/kvm/vmx.c
+++ b/trunk/drivers/kvm/vmx.c
@@ -1030,7 +1030,7 @@ static void enter_pmode(struct kvm_vcpu *vcpu)
 	vmcs_write32(GUEST_CS_AR_BYTES, 0x9b);
 }
 
-static int rmode_tss_base(struct kvm* kvm)
+static gva_t rmode_tss_base(struct kvm* kvm)
 {
 	gfn_t base_gfn = kvm->memslots[0].base_gfn + kvm->memslots[0].npages - 3;
 	return base_gfn << PAGE_SHIFT;