From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Collins Subject: [PATCH] Fix kvm-svn/kernel build on 32-bit Date: Sat, 03 Feb 2007 19:55:57 -0500 Message-ID: <1170550557.6103.8.camel@gullible> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org Build currently fails with x86. Index: kernel/kvm_main.c =================================================================== --- kernel/kvm_main.c (revision 4381) +++ kernel/kvm_main.c (working copy) @@ -1148,6 +1148,7 @@ kvm_arch_ops->decache_regs(vcpu); ret = -KVM_EINVAL; +#ifdef CONFIG_X86_64 if (is_long_mode(vcpu)) { nr = vcpu->regs[VCPU_REGS_RAX]; a0 = vcpu->regs[VCPU_REGS_RDI]; @@ -1156,7 +1157,9 @@ a3 = vcpu->regs[VCPU_REGS_RCX]; a4 = vcpu->regs[VCPU_REGS_R8]; a5 = vcpu->regs[VCPU_REGS_R9]; - } else { + } else +#endif + { nr = vcpu->regs[VCPU_REGS_RBX] & -1u; a0 = vcpu->regs[VCPU_REGS_RAX] & -1u; a1 = vcpu->regs[VCPU_REGS_RCX] & -1u; -- Ubuntu: http://www.ubuntu.com/ Linux1394: http://www.linux1394.org/ ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642