git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
pci-dma.c
diff --git
a/arch/x86/kernel/pci-dma.c
b/arch/x86/kernel/pci-dma.c
index
8467ec2
..
a4213c0
100644
(file)
--- a/
arch/x86/kernel/pci-dma.c
+++ b/
arch/x86/kernel/pci-dma.c
@@
-5,12
+5,11
@@
#include <asm/proto.h>
#include <asm/dma.h>
#include <asm/proto.h>
#include <asm/dma.h>
-#include <asm/
gart
.h>
+#include <asm/
iommu
.h>
#include <asm/calgary.h>
#include <asm/amd_iommu.h>
#include <asm/calgary.h>
#include <asm/amd_iommu.h>
-int forbid_dac __read_mostly;
-EXPORT_SYMBOL(forbid_dac);
+static int forbid_dac __read_mostly;
const struct dma_mapping_ops *dma_ops;
EXPORT_SYMBOL(dma_ops);
const struct dma_mapping_ops *dma_ops;
EXPORT_SYMBOL(dma_ops);
@@
-114,21
+113,15
@@
void __init pci_iommu_alloc(void)
* The order of these functions is important for
* fall-back/fail-over reasons
*/
* The order of these functions is important for
* fall-back/fail-over reasons
*/
-#ifdef CONFIG_GART_IOMMU
gart_iommu_hole_init();
gart_iommu_hole_init();
-#endif
-#ifdef CONFIG_CALGARY_IOMMU
detect_calgary();
detect_calgary();
-#endif
detect_intel_iommu();
amd_iommu_detect();
detect_intel_iommu();
amd_iommu_detect();
-#ifdef CONFIG_SWIOTLB
pci_swiotlb_init();
pci_swiotlb_init();
-#endif
}
#endif
}
#endif
@@
-184,9
+177,7
@@
static __init int iommu_setup(char *p)
swiotlb = 1;
#endif
swiotlb = 1;
#endif
-#ifdef CONFIG_GART_IOMMU
gart_parse_options(p);
gart_parse_options(p);
-#endif
#ifdef CONFIG_CALGARY_IOMMU
if (!strncmp(p, "calgary", 7))
#ifdef CONFIG_CALGARY_IOMMU
if (!strncmp(p, "calgary", 7))
@@
-500,17
+491,13
@@
EXPORT_SYMBOL(dma_free_coherent);
static int __init pci_iommu_init(void)
{
static int __init pci_iommu_init(void)
{
-#ifdef CONFIG_CALGARY_IOMMU
calgary_iommu_init();
calgary_iommu_init();
-#endif
intel_iommu_init();
amd_iommu_init();
intel_iommu_init();
amd_iommu_init();
-#ifdef CONFIG_GART_IOMMU
gart_iommu_init();
gart_iommu_init();
-#endif
no_iommu_init();
return 0;
no_iommu_init();
return 0;