---

yaml --- r: 8587 b: refs/heads/master c: a54e678 h: refs/heads/master i: 8585: 74fbd36 8583: aa913f8 v: v3
git-mirror · Sep 12, 2005 · 165336b · 165336b
1 parent 93357ab
commit 165336b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91
+refs/heads/master: a54e678b8f476d6f28e6aa4409f6b88ce476af1b
diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c
@@ -403,8 +403,6 @@ static inline int page_is_ram (unsigned long pagenr)
 	return 0;
 }
 
-extern int swiotlb_force;
-
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
 			 kcore_vsyscall;
 
@@ -414,8 +412,6 @@ void __init mem_init(void)
 	int tmp;
 
 #ifdef CONFIG_SWIOTLB
-	if (swiotlb_force)
-		swiotlb = 1;
 	if (!iommu_aperture &&
 	    (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
 	       swiotlb = 1;