Signed-off-by: Daniel Hecken dh-LcvzS2Pvy/8X0D0ZMPkEVw@public.gmane.org 

--- my-kvm-tree/drivers/kvm/vmx.c	2007-05-21 09:19:41.000000000 +0200
+++ kvm-trunk/kernel/vmx.c	2007-05-21 09:35:05.000000000 +0200
@@ -41,7 +41,10 @@
 #else
 #define HOST_IS_64 0
 #endif
+
+#ifdef CONFIG_X86_64
 #define EFER_SAVE_RESTORE_BITS ((u64)EFER_SCE)
+#endif
 
 static struct vmcs_descriptor {
 	int size;
@@ -87,7 +90,9 @@
 
 static inline u64 msr_efer_save_restore_bits(struct vmx_msr_entry msr)
 {
+#ifdef CONFIG_X86_64
 	return (u64)msr.data & EFER_SAVE_RESTORE_BITS;
+#endif
 }
 
 static inline int msr_efer_need_save_restore(struct kvm_vcpu *vcpu)
@@ -279,6 +284,7 @@
 
 static void load_transition_efer(struct kvm_vcpu *vcpu)
 {
+#ifdef CONFIG_X86_64
 	u64 trans_efer;
 	int efer_offset = vcpu->msr_offset_efer;
 
@@ -288,6 +294,7 @@
 				vcpu->guest_msrs[efer_offset]);
 	wrmsrl(MSR_EFER, trans_efer);
 	vcpu->stat.efer_reload++;
+#endif
 }
 
 static void vmx_save_host_state(struct kvm_vcpu *vcpu)