Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754208AbYJ1VWt (ORCPT ); Tue, 28 Oct 2008 17:22:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753579AbYJ1VW3 (ORCPT ); Tue, 28 Oct 2008 17:22:29 -0400 Received: from accolon.hansenpartnership.com ([76.243.235.52]:43169 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753481AbYJ1VW2 (ORCPT ); Tue, 28 Oct 2008 17:22:28 -0400 Subject: [PATCH] x86: Fix CONFIG_PCI=n compile failure From: James Bottomley To: Linus Torvalds Cc: Glauber Costa , linux-kernel , Ingo Molnar , Thomas Gleixner Content-Type: text/plain Date: Tue, 28 Oct 2008 16:22:23 -0500 Message-Id: <1225228943.3251.17.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 (2.22.3.1-1.fc9) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1300 Lines: 43 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 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 #ifdef CONFIG_SWIOTLB if (!strncmp(p, "soft", 4)) swiotlb = 1; -- 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/