Commit 70408a99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-next' of git://git.kernel.org/pub/scm/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
parents a4648c75 02b4da5f

arch/ia64/hp/common/sba_iommu.c

+0 −4
Original line number Diff line number Diff line
@@ -2207,10 +2207,6 @@ const struct dma_map_ops sba_dma_ops = { 
	.unmap_page		= sba_unmap_page,

	.map_sg			= sba_map_sg_attrs,

	.unmap_sg		= sba_unmap_sg_attrs,

	.sync_single_for_cpu	= machvec_dma_sync_single,

	.sync_sg_for_cpu	= machvec_dma_sync_sg,

	.sync_single_for_device	= machvec_dma_sync_single,

	.sync_sg_for_device	= machvec_dma_sync_sg,

	.dma_supported		= sba_dma_supported,

	.mapping_error		= sba_dma_mapping_error,

};

arch/ia64/include/asm/dma-mapping.h

+0 −5
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ extern const struct dma_map_ops *dma_ops; 
extern struct ia64_machine_vector ia64_mv;

extern void set_iommu_machvec(void);



extern void machvec_dma_sync_single(struct device *, dma_addr_t, size_t,

				    enum dma_data_direction);

extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,

				enum dma_data_direction);



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return platform_dma_get_ops(NULL);

arch/ia64/include/asm/iommu.h

+0 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT (((cycles_t) local_cpu_data->itc_freq)*10)



extern void pci_iommu_shutdown(void);

extern void no_iommu_init(void);

#ifdef	CONFIG_INTEL_IOMMU

extern int force_iommu, no_iommu;
@@ -16,7 +15,6 @@ extern int iommu_detected; 
#define no_iommu		(1)

#define iommu_detected		(0)

#endif

extern void iommu_dma_init(void);

extern void machvec_init(const char *name);



#endif

arch/ia64/kernel/efi.c

+0 −1
Original line number Diff line number Diff line
@@ -842,7 +842,6 @@ kern_mem_attribute (unsigned long phys_addr, unsigned long size) 
	} while (md);

	return 0;	/* never reached */

}

EXPORT_SYMBOL(kern_mem_attribute);



int

valid_phys_addr_range (phys_addr_t phys_addr, unsigned long size)

arch/ia64/kernel/machvec.c

+0 −16
Original line number Diff line number Diff line
@@ -73,19 +73,3 @@ machvec_timer_interrupt (int irq, void *dev_id) 
{

}

EXPORT_SYMBOL(machvec_timer_interrupt);
 


void

machvec_dma_sync_single(struct device *hwdev, dma_addr_t dma_handle, size_t size,

			enum dma_data_direction dir)

{

	mb();

}

EXPORT_SYMBOL(machvec_dma_sync_single);



void

machvec_dma_sync_sg(struct device *hwdev, struct scatterlist *sg, int n,

		    enum dma_data_direction dir)

{

	mb();

}

EXPORT_SYMBOL(machvec_dma_sync_sg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE