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

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

x86: remove ifdef CONFIG_SWIOTLB in pci-dma.c 



As other IOMMUs do, this puts dummy pci_swiotlb_init() in swiotlb.h
and remove ifdef CONFIG_SWIOTLB in pci-dma.c.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b8b48326

arch/x86/kernel/pci-dma.c

+0 −2
Original line number Diff line number Diff line
@@ -122,9 +122,7 @@ void __init pci_iommu_alloc(void) 


	amd_iommu_detect();



#ifdef CONFIG_SWIOTLB

	pci_swiotlb_init();

#endif

}

#endif

include/asm-x86/swiotlb.h

+4 −2
Original line number Diff line number Diff line
@@ -45,12 +45,14 @@ extern int swiotlb_force; 


#ifdef CONFIG_SWIOTLB

extern int swiotlb;

extern void pci_swiotlb_init(void);

#else

#define swiotlb 0

static inline void pci_swiotlb_init(void)

{

}

#endif



extern void pci_swiotlb_init(void);



static inline void dma_mark_clean(void *addr, size_t size) {}



#endif /* _ASM_SWIOTLB_H */