Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/x86_64/mm/init.c

+0 −4
Original line number Diff line number Diff line
@@ -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;