Messages in this thread Patch in this message | | | Subject | [PATCH] x86: Fix CONFIG_PCI=n compile failure | From | James Bottomley <> | Date | Tue, 28 Oct 2008 16:22:23 -0500 |
| |
This:
commit fae9a0d8ca68a14da8d2351ad3e0bf42f3b29899 Author: Glauber Costa <gcosta@redhat.com> 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 <James.Bottomley@HansenPartnership.com>
---
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;
| |