Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753310AbYJ2HhV (ORCPT ); Wed, 29 Oct 2008 03:37:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752257AbYJ2HhJ (ORCPT ); Wed, 29 Oct 2008 03:37:09 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:60095 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751701AbYJ2HhH (ORCPT ); Wed, 29 Oct 2008 03:37:07 -0400 Date: Wed, 29 Oct 2008 08:36:29 +0100 From: Ingo Molnar To: James Bottomley Cc: Linus Torvalds , Glauber Costa , linux-kernel , Thomas Gleixner Subject: Re: [PATCH] x86: Fix CONFIG_PCI=n compile failure Message-ID: <20081029073629.GB17992@elte.hu> References: <1225228943.3251.17.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1225228943.3251.17.camel@localhost.localdomain> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00,DNS_FROM_SECURITYSAGE autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] 0.0 DNS_FROM_SECURITYSAGE RBL: Envelope sender in blackholes.securitysage.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2462 Lines: 74 * James Bottomley wrote: > This: > > commit fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 > Author: Glauber Costa > Date: Tue Apr 8 13:20:56 2008 -0300 > > x86: merge iommu initialization parameters > > Moved the forbid_dac parameter into pci-dma.c but forgot that it's a > PCI only symbol thus causing a compile failure if CONFIG_PCI=N. Fix > by surrounding the set clause in iommu_setup with #ifdef CONFIG_PCI uhm, that's wrong James, the above commit you refer to is half a year old and has been released in v2.6.26 and v2.6.27 ;-) The patch that broke the !CONFIG_PCI build in this cycle is this one: | From 5b6985ce8ec7127b4d60ad450b64ca8b82748a3b Mon Sep 17 00:00:00 2001 | From: Fenghua Yu | Date: Thu, 16 Oct 2008 18:02:32 -0700 | Subject: [PATCH] intel-iommu: IA64 support | | The current Intel IOMMU code assumes that both host page size and | Intel IOMMU page size are 4KiB. The first patch supports variable | page size. This provides support for IA64 which has multiple page | sizes. | | This patch also adds some other code hooks for IA64 platform | including DMAR_OPERATION_TIMEOUT definition. | | [dwmw2: some cleanup] | Signed-off-by: Fenghua Yu | Signed-off-by: Tony Luck | Signed-off-by: David Woodhouse > Signed-off-by: James Bottomley > > --- > > diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c > index 1972266..47c5a7a 100644 > --- a/arch/x86/kernel/pci-dma.c > +++ b/arch/x86/kernel/pci-dma.c > @@ -202,6 +202,7 @@ static __init int iommu_setup(char *p) > iommu_merge = 0; > if (!strncmp(p, "forcesac", 8)) > iommu_sac_force = 1; > +#ifdef CONFIG_PCI > if (!strncmp(p, "allowdac", 8)) > forbid_dac = 0; > if (!strncmp(p, "nodac", 5)) > @@ -210,6 +211,7 @@ static __init int iommu_setup(char *p) > forbid_dac = -1; > return 1; > } > +#endif that's the wrong fix, the right fix from Fenghua Yu (from about a week ago) is at: http://marc.info/?l=linux-kernel&m=122480590627590&w=2 and it is in the PCI tree already. Ingo -- 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/