Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753663Ab0G1NK7 (ORCPT ); Wed, 28 Jul 2010 09:10:59 -0400 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:15271 "EHLO SMTP.EU.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753477Ab0G1NK4 (ORCPT ); Wed, 28 Jul 2010 09:10:56 -0400 X-IronPort-AV: E=Sophos;i="4.55,274,1278288000"; d="scan'208";a="1111788" Date: Wed, 28 Jul 2010 14:11:45 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball-desktop To: Randy Dunlap CC: Stephen Rothwell , "linux-next@vger.kernel.org" , LKML , "jeremy@goop.org" , Jeremy Fitzhardinge Subject: Re: linux-next: Tree for July 27 (xen) In-Reply-To: <4C4F27A3.5040109@oracle.com> Message-ID: References: <20100727160708.722c39c1.sfr@canb.auug.org.au> <4C4F27A3.5040109@oracle.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1576 Lines: 50 On Tue, 27 Jul 2010, Randy Dunlap wrote: > Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20100726: > > > > > > The xen tree lost its build problems but gained a conflict against Linus' > > tree. > > when X86_32=y, SMP=n, X86_LOCAL_APIC=n: > > drivers/built-in.o: In function `xen_callback_vector': > (.text+0x41238): undefined reference to `first_system_vector' > > alloc_intr_gate() calls alloc_system_vector(), which uses first_system_vector. this patch should solve the issue: --- alloc_system_vector: access first_system_vector when X86_LOCAL_APIC=y Currently alloc_system_vector reads and writes first_system_vector unconditionally while first_system_vector is only defined when CONFIG_X86_LOCAL_APIC=y. This patch makes sure first_system_vector is accessed only in that case. Signed-off-by: Stefano Stabellini diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index 617bd56..f83e055 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h @@ -341,8 +341,10 @@ static inline void alloc_system_vector(int vector) { if (!test_bit(vector, used_vectors)) { set_bit(vector, used_vectors); +#if defined(CONFIG_X86_LOCAL_APIC) if (first_system_vector > vector) first_system_vector = vector; +#endif } else BUG(); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/