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

Commit a166222c authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Fix CONFIG_IOMMU_DEBUG 



If CONFIG_IOMMU_DEBUG is set force_iommu defaults to 1. In the case
where no HW IOMMU is present in the machine and we end up using nommu,
leaving force_iommu set to 1 causes dma_alloc_coherent to do the wrong
thing. Therefore, if we end up using nommu, make sure force_iommu is
0.

Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2699500b

arch/x86_64/kernel/pci-nommu.c

+2 −0
Original line number Diff line number Diff line
@@ -92,5 +92,7 @@ void __init no_iommu_init(void) 
{

	if (dma_ops)

		return;



	force_iommu = 0; /* no HW IOMMU */

	dma_ops = &nommu_dma_ops;

}