Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2004-05-09 04:25:35 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-09 04:25:35 -0700
commitc99ae253229080624867c02818f999680a613ff2 (patch)
tree1216e76a42b7d0eee462c08f285aeff9c049626d
parent57bfa2c5e66892a5384ba77c26aa61b436ceb83f (diff)
[PATCH] Fix x86-64 compilation without iommu for 2.6.6rc3
Various people hit this in earlier kernels. The x86-64 kernel did not compile without CONFIG_IOMMU_GART in various configurations. Just add the missing symbol and export it. Also export iommu_merge while I am at it.
-rw-r--r--arch/x86_64/kernel/pci-gart.c1
-rw-r--r--arch/x86_64/kernel/pci-nommu.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 292b675293e5..8eb20a7dc299 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -618,6 +618,7 @@ EXPORT_SYMBOL(pci_dma_supported);
EXPORT_SYMBOL(no_iommu);
EXPORT_SYMBOL(force_iommu);
EXPORT_SYMBOL(bad_dma_address);
+EXPORT_SYMBOL(iommu_merge);
static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)
{
diff --git a/arch/x86_64/kernel/pci-nommu.c b/arch/x86_64/kernel/pci-nommu.c
index 278c626badd8..00fb2645c510 100644
--- a/arch/x86_64/kernel/pci-nommu.c
+++ b/arch/x86_64/kernel/pci-nommu.c
@@ -5,6 +5,10 @@
#include <asm/proto.h>
int iommu_merge = 0;
+EXPORT_SYMBOL(iommu_merge);
+
+dma_addr_t bad_dma_address;
+EXPORT_SYMBOL(bad_dma_address);
/*
* Dummy IO MMU functions