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
x86: GART: Convert gart_iommu_hole_init() to use iommu_init hook
[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
d20009b
..
ecde854
100644
(file)
--- a/
arch/x86/kernel/pci-dma.c
+++ b/
arch/x86/kernel/pci-dma.c
@@
-216,7
+216,7
@@
static __init int iommu_setup(char *p)
if (!strncmp(p, "allowdac", 8))
forbid_dac = 0;
if (!strncmp(p, "nodac", 5))
if (!strncmp(p, "allowdac", 8))
forbid_dac = 0;
if (!strncmp(p, "nodac", 5))
- forbid_dac =
-
1;
+ forbid_dac = 1;
if (!strncmp(p, "usedac", 6)) {
forbid_dac = -1;
return 1;
if (!strncmp(p, "usedac", 6)) {
forbid_dac = -1;
return 1;
@@
-292,26
+292,17
@@
static int __init pci_iommu_init(void)
dma_debug_add_bus(&pci_bus_type);
#endif
dma_debug_add_bus(&pci_bus_type);
#endif
-
calgary_
iommu_init();
+
x86_init.iommu.
iommu_init();
intel_iommu_init();
amd_iommu_init();
intel_iommu_init();
amd_iommu_init();
- gart_iommu_init();
-
no_iommu_init();
return 0;
}
no_iommu_init();
return 0;
}
-
-void pci_iommu_shutdown(void)
-{
- gart_iommu_shutdown();
-
- amd_iommu_shutdown();
-}
/* Must execute after PCI subsystem */
/* Must execute after PCI subsystem */
-fs_initcall(pci_iommu_init);
+
root
fs_initcall(pci_iommu_init);
#ifdef CONFIG_PCI
/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
#ifdef CONFIG_PCI
/* Many VIA bridges seem to corrupt data for DAC. Disable it here */