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

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 <fujita.tomonori@lab.ntt.co.jp>
LKML-Reference: <1258199198-16657-2-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b18485e7

arch/x86/kernel/pci-dma.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ 




static int forbid_dac __read_mostly;

static int forbid_dac __read_mostly;





struct dma_map_ops *dma_ops;

struct dma_map_ops *dma_ops = &nommu_dma_ops;

EXPORT_SYMBOL(dma_ops);

EXPORT_SYMBOL(dma_ops);





static int iommu_sac_force __read_mostly;

static int iommu_sac_force __read_mostly;
@@ -128,8 +128,6 @@ void __init pci_iommu_alloc(void) 
#ifdef CONFIG_X86_64

#ifdef CONFIG_X86_64

	/* free the range so iommu could get some range less than 4G */

	/* free the range so iommu could get some range less than 4G */

	dma32_free_bootmem();

	dma32_free_bootmem();

#else

	dma_ops = &nommu_dma_ops;

#endif

#endif

	if (pci_swiotlb_init())

	if (pci_swiotlb_init())

		return;

		return;

arch/x86/kernel/pci-swiotlb.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,7 @@ int __init pci_swiotlb_init(void) 
	if (swiotlb) {

	if (swiotlb) {

		swiotlb_init(0);

		swiotlb_init(0);

		dma_ops = &swiotlb_dma_ops;

		dma_ops = &swiotlb_dma_ops;

	} else

	}

		dma_ops = &nommu_dma_ops;





	return swiotlb_force;

	return swiotlb_force;

}
 
}