From 165336b72fe4bd3c768abcd4543d5cbb66ff29b4 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 12 Sep 2005 18:49:24 +0200
Subject: [PATCH] --- yaml --- r: 8587 b: refs/heads/master c:
 a54e678b8f476d6f28e6aa4409f6b88ce476af1b h: refs/heads/master i:   8585:
 74fbd3694fa98ef09dff83d172ba2b184b125893   8583:
 aa913f82f0d994e807c7414612fbbb7496d976fb v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86_64/mm/init.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1900503fb3a6..0baea7aaa602 100644
--- 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
index aa4a5189ecee..47cf9163aa89 100644
--- 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;