x86: remove ifdef CONFIG_SWIOTLB in pci-dma.c

fujita · Ingo Molnar · commit be54f9d1c8df · 2008-07-11T11:00:55.000+02:00
As other IOMMUs do, this puts dummy pci_swiotlb_init() in swiotlb.h
and remove ifdef CONFIG_SWIOTLB in pci-dma.c.

Signed-off-by: FUJITA Tomonori &lt;fujita.tomonori@lab.ntt.co.jp&gt;
Acked-by: Muli Ben-Yehuda &lt;muli@il.ibm.com&gt;
Signed-off-by: Ingo Molnar &lt;mingo@elte.hu&gt;
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
@@ -122,9 +122,7 @@ void __init pci_iommu_alloc(void)
 
 	amd_iommu_detect();
 
-#ifdef CONFIG_SWIOTLB
 	pci_swiotlb_init();
-#endif
 }
 #endif
 
diff --git a/include/asm-x86/swiotlb.h b/include/asm-x86/swiotlb.h
@@ -45,12 +45,14 @@ extern int swiotlb_force;
 
 #ifdef CONFIG_SWIOTLB
 extern int swiotlb;
+extern void pci_swiotlb_init(void);
 #else
 #define swiotlb 0
+static inline void pci_swiotlb_init(void)
+{
+}
 #endif
 
-extern void pci_swiotlb_init(void);
-
 static inline void dma_mark_clean(void *addr, size_t size) {}
 
 #endif /* _ASM_SWIOTLB_H */

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,7 @@ void __init pci_iommu_alloc(void)`
`122`	`122`
`123`	`123`	`amd_iommu_detect();`
`124`	`124`
`125`		`-#ifdef CONFIG_SWIOTLB`
`126`	`125`	`pci_swiotlb_init();`
`127`		`-#endif`
`128`	`126`	`}`
`129`	`127`	`#endif`
`130`	`128`