---

yaml --- r: 176207 b: refs/heads/master c: f4780ca h: refs/heads/master i: 176205: 76dde5f 176203: 16e1d9f 176199: 9210933 176191: b7bcb66 v: v3
git-mirror · Dec 14, 2009 · 47b92de · 47b92de
1 parent 5cd70c8
commit 47b92de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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();