Commit a3b28ee1 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

x86: Set dma_ops to nommu_dma_ops by default

We set dma_ops to nommu_dma_ops at two different places for
x86_32 and x86_64. This unifies them by setting dma_ops to
nommu_dma_ops by default.
Signed-off-by: default avatarFUJITA Tomonori <>
LKML-Reference: <>
Signed-off-by: default avatarIngo Molnar <>
parent b18485e7
......@@ -15,7 +15,7 @@
static int forbid_dac __read_mostly;
struct dma_map_ops *dma_ops;
struct dma_map_ops *dma_ops = &nommu_dma_ops;
static int iommu_sac_force __read_mostly;
......@@ -128,8 +128,6 @@ void __init pci_iommu_alloc(void)
#ifdef CONFIG_X86_64
/* free the range so iommu could get some range less than 4G */
dma_ops = &nommu_dma_ops;
if (pci_swiotlb_init())
......@@ -61,8 +61,7 @@ int __init pci_swiotlb_init(void)
if (swiotlb) {
dma_ops = &swiotlb_dma_ops;
} else
dma_ops = &nommu_dma_ops;
return swiotlb_force;
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