diff --git a/[refs] b/[refs]
index c921b7707b16..5e00bb01ae7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f411e6cdc275e63ead2ffb427d0497daae6f6069
+refs/heads/master: 2e4ce7f574369f374ad537a180b4870e2098cf0e
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 54e732d74fb1..58badf1657d4 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -3602,7 +3602,9 @@ static u32 vmx_secondary_exec_control(struct vcpu_vmx *vmx)
  */
 static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
 {
+#ifdef CONFIG_X86_64
 	unsigned long a;
+#endif
 	int i;
 
 	/* I/O */