diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2004-09-26 17:24:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-09-26 17:24:09 -0700 |
| commit | 3a358787f817c07d051b936213cbfa6c9d3695f7 (patch) | |
| tree | 370bb47ef7d2a3b4db41e3da87db036ba3c1a96c /include | |
| parent | 5938570e89b30a393b8a1b6b7824a8632b104d1f (diff) | |
[PATCH] ppc64: Make the DART "iommu" code more generic
The "DART" iommu used on Apple U3 chipset will appear into 3rd party
products soon, thus the code shouldn't be named "pmac_*" anymore.
Also, the explicit config option is no longer needed, there is no
reason to build a PowerMac kernel without the iommu support, and
it can always be disabled at runtime with a cmdline option for
testing or debugging.
This patch do the appropriate renaming and makes the config option
implicit & selected when pmac support is included.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc64/iommu.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-ppc64/iommu.h b/include/asm-ppc64/iommu.h index 2985dcf9bfea..e67575457fb2 100644 --- a/include/asm-ppc64/iommu.h +++ b/include/asm-ppc64/iommu.h @@ -108,7 +108,7 @@ struct scatterlist; /* Walks all buses and creates iommu tables */ extern void iommu_setup_pSeries(void); -extern void iommu_setup_pmac(void); +extern void iommu_setup_u3(void); /* Creates table for an individual device node */ extern void iommu_devnode_init(struct device_node *dn); @@ -155,6 +155,8 @@ extern void tce_init_iSeries(void); extern void pci_iommu_init(void); extern void pci_dma_init_direct(void); +extern void alloc_u3_dart_table(void); + extern int ppc64_iommu_off; #endif /* _ASM_IOMMU_H */ |