From: Linus Torvalds Date: Tue, 23 Oct 2018 10:06:43 +0000 (+0100) Subject: Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=70408a9987d1ffac006e21b965f0c30dd22b0af2;p=linux.git Merge tag 'please-pull-next' of git://git./linux/kernel/git/aegl/linux Pull ia64 updates from Tony Luck: "Miscellaneous ia64 fixes from Christoph" * tag 'please-pull-next' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: intel-iommu: mark intel_dma_ops static ia64: remove machvec_dma_sync_{single,sg} ia64/sn2: remove no-ops dma sync methods ia64: remove the unused iommu_dma_init function ia64: remove the unused pci_iommu_shutdown function ia64: remove the unused bad_dma_address symbol ia64: remove iommu_dma_supported ia64: remove the dead iommu_sac_force variable ia64: remove the kern_mem_attribute export --- 70408a9987d1ffac006e21b965f0c30dd22b0af2 diff --cc arch/ia64/sn/pci/pci_dma.c index 96eb2567718a2,3b944fba0a3eb..4ce4ee4ef9f2c --- a/arch/ia64/sn/pci/pci_dma.c +++ b/arch/ia64/sn/pci/pci_dma.c @@@ -466,13 -442,8 +441,9 @@@ static struct dma_map_ops sn_dma_ops = .unmap_page = sn_dma_unmap_page, .map_sg = sn_dma_map_sg, .unmap_sg = sn_dma_unmap_sg, - .sync_single_for_cpu = sn_dma_sync_single_for_cpu, - .sync_sg_for_cpu = sn_dma_sync_sg_for_cpu, - .sync_single_for_device = sn_dma_sync_single_for_device, - .sync_sg_for_device = sn_dma_sync_sg_for_device, .mapping_error = sn_dma_mapping_error, .dma_supported = sn_dma_supported, + .get_required_mask = sn_dma_get_required_mask, }; void sn_dma_init(void)