From b765c1f080e0ea1584594018d211da8873d70314 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Fri, 11 Jul 2008 10:23:45 +0900
Subject: [PATCH] --- yaml --- r: 104367 b: refs/heads/master c:
 be54f9d1c8df93c4998e134a306652caaa58f67f h: refs/heads/master i:   104365:
 078c10c2b04eea213bf126d83e23f090c39c332f   104363:
 cf34b4d53e4f00c88336317553d8e481eab67fd4   104359:
 e3d126a61be8c354bba633b451ae5bf91d47afa6   104351:
 c15f8fd7f3e71c802f57a494be3af797854e47c9 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/pci-dma.c | 2 --
 trunk/include/asm-x86/swiotlb.h | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3f1410f6a8fa..188c4f78625b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8b48326f312026af12799917383c54c25d05482
+refs/heads/master: be54f9d1c8df93c4998e134a306652caaa58f67f
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index f16cbbe424a1..d12945de0565 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/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/trunk/include/asm-x86/swiotlb.h b/trunk/include/asm-x86/swiotlb.h
index f5d9e74b1e4a..c706a7442633 100644
--- a/trunk/include/asm-x86/swiotlb.h
+++ b/trunk/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 */