From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 16:49:24 +0000 (+0200)
Subject: [PATCH] x86-64: Remove redundant swiotlb=force handling
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a54e678b8f476d6f28e6aa4409f6b88ce476af1b;p=openwrt%2Fstaging%2Fblogic.git

[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>
---

diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index aa4a5189ecee..47cf9163aa89 100644
--- a/arch/x86_64/mm/init.c
+++ b/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;