From 47b92dee11039599cba3c152d88a25277cb3cfae Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 14 Dec 2009 11:52:14 +0900
Subject: [PATCH] --- yaml --- r: 176207 b: refs/heads/master c:
 f4780ca005404166cc40af77ef0e86132ab98a81 h: refs/heads/master i:   176205:
 76dde5f78f0dc75302a31fef0a910ba71bfff2c6   176203:
 16e1d9f3c89f23ea96796ad83b2fccbcc446e86c   176199:
 92109335af1e1dd82a68ccff9217f501333a5add   176191:
 b7bcb6643f6ded08f9e111c469dd00010a595220 v: v3

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

diff --git a/[refs] b/[refs]
index f25fe24e8b02..280f60a00fa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eba11d6da7a983cedb0acf32a38e4d0daa8b5d0e
+refs/heads/master: f4780ca005404166cc40af77ef0e86132ab98a81
diff --git a/trunk/arch/x86/kernel/pci-dma.c b/trunk/arch/x86/kernel/pci-dma.c
index afcc58b69c7c..fcc2f2bfa39c 100644
--- a/trunk/arch/x86/kernel/pci-dma.c
+++ b/trunk/arch/x86/kernel/pci-dma.c
@@ -120,11 +120,14 @@ static void __init dma32_free_bootmem(void)
 
 void __init pci_iommu_alloc(void)
 {
+	int use_swiotlb;
+
+	use_swiotlb = pci_swiotlb_init();
 #ifdef CONFIG_X86_64
 	/* free the range so iommu could get some range less than 4G */
 	dma32_free_bootmem();
 #endif
-	if (pci_swiotlb_init())
+	if (use_swiotlb)
 		return;
 
 	gart_iommu_hole_init();