瀏覽代碼

[PATCH] x86-64: Remove redundant swiotlb=force handling

It's already handled in the main swiotlb code.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andi Kleen 20 年之前
父節點
當前提交
a54e678b8f
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      arch/x86_64/mm/init.c

+ 0 - 4
arch/x86_64/mm/init.c

@@ -403,8 +403,6 @@ static inline int page_is_ram (unsigned long pagenr)
 	return 0;
 	return 0;
 }
 }
 
 
-extern int swiotlb_force;
-
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
 			 kcore_vsyscall;
 			 kcore_vsyscall;
 
 
@@ -414,8 +412,6 @@ void __init mem_init(void)
 	int tmp;
 	int tmp;
 
 
 #ifdef CONFIG_SWIOTLB
 #ifdef CONFIG_SWIOTLB
-	if (swiotlb_force)
-		swiotlb = 1;
 	if (!iommu_aperture &&
 	if (!iommu_aperture &&
 	    (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
 	    (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
 	       swiotlb = 1;
 	       swiotlb = 1;