提交 a166222c 编写于 作者: M Muli Ben-Yehuda 提交者: Linus Torvalds

[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: NMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: NAndi Kleen <ak@suse.de>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 2699500b
...@@ -92,5 +92,7 @@ void __init no_iommu_init(void) ...@@ -92,5 +92,7 @@ void __init no_iommu_init(void)
{ {
if (dma_ops) if (dma_ops)
return; return;
force_iommu = 0; /* no HW IOMMU */
dma_ops = &nommu_dma_ops; dma_ops = &nommu_dma_ops;
} }
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册