Commit a54e678b authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

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

It's already handled in the main swiotlb code.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 63f02fd7
...@@ -403,8 +403,6 @@ static inline int page_is_ram (unsigned long pagenr) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment