Merge branch 'swiotlb' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (3a714237) · Commits · e / devices / android_kernel_fairphone_FP5

arch/ia64/Kconfig

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,10 @@ config MMU
	bool		bool
	default y		default y

			config SWIOTLB
			bool
			default y

	config RWSEM_XCHGADD_ALGORITHM		config RWSEM_XCHGADD_ALGORITHM
	bool		bool
	default y		default y

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ lib-y := __divsi3.o __udivsi3.o __modsi3.o __umodsi3.o \
	bitop.o checksum.o clear_page.o csum_partial_copy.o \		bitop.o checksum.o clear_page.o csum_partial_copy.o \
	clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o \		clear_user.o strncpy_from_user.o strlen_user.o strnlen_user.o \
	flush.o ip_fast_csum.o do_csum.o \		flush.o ip_fast_csum.o do_csum.o \
	memset.o strlen.o swiotlb.o		memset.o strlen.o

	lib-$(CONFIG_ITANIUM) += copy_page.o copy_user.o memcpy.o		lib-$(CONFIG_ITANIUM) += copy_page.o copy_user.o memcpy.o
	lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o		lib-$(CONFIG_MCKINLEY) += copy_page_mck.o memcpy_mck.o

+0 −2

+27 −4

Original line number	Original line	Diff line number	Diff line
	@@ -85,10 +85,33 @@ static inline void dma_sync_single_for_device(struct device *hwdev,
	flush_write_buffers();		flush_write_buffers();
	}		}

	#define dma_sync_single_range_for_cpu(dev, dma_handle, offset, size, dir) \		static inline void dma_sync_single_range_for_cpu(struct device *hwdev,
	dma_sync_single_for_cpu(dev, dma_handle, size, dir)		dma_addr_t dma_handle,
	#define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir) \		unsigned long offset,
	dma_sync_single_for_device(dev, dma_handle, size, dir)		size_t size, int direction)
			{
			if (direction == DMA_NONE)
			out_of_line_bug();

			if (swiotlb)
			return swiotlb_sync_single_range_for_cpu(hwdev,dma_handle,offset,size,direction);

			flush_write_buffers();
			}

			static inline void dma_sync_single_range_for_device(struct device *hwdev,
			dma_addr_t dma_handle,
			unsigned long offset,
			size_t size, int direction)
			{
			if (direction == DMA_NONE)
			out_of_line_bug();

			if (swiotlb)
			return swiotlb_sync_single_range_for_device(hwdev,dma_handle,offset,size,direction);

			flush_write_buffers();
			}

	static inline void dma_sync_sg_for_cpu(struct device *hwdev,		static inline void dma_sync_sg_for_cpu(struct device *hwdev,
	struct scatterlist *sg,		struct scatterlist *sg,

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -15,6 +15,14 @@ extern void swiotlb_sync_single_for_cpu(struct device *hwdev,
	extern void swiotlb_sync_single_for_device(struct device *hwdev,		extern void swiotlb_sync_single_for_device(struct device *hwdev,
	dma_addr_t dev_addr,		dma_addr_t dev_addr,
	size_t size, int dir);		size_t size, int dir);
			extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,
			dma_addr_t dev_addr,
			unsigned long offset,
			size_t size, int dir);
			extern void swiotlb_sync_single_range_for_device(struct device *hwdev,
			dma_addr_t dev_addr,
			unsigned long offset,
			size_t size, int dir);
	extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,		extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,
	struct scatterlist *sg, int nelems,		struct scatterlist *sg, int nelems,
	int dir);		int dir);

Original line number	Original line	Diff line number	Diff line
	@@ -27,7 +27,6 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/
	obj-$(CONFIG_EARLY_PRINTK) += early_printk.o		obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
	obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o		obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o
	obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o		obj-$(CONFIG_DUMMY_IOMMU) += pci-nommu.o pci-dma.o
	obj-$(CONFIG_SWIOTLB) += swiotlb.o
	obj-$(CONFIG_KPROBES) += kprobes.o		obj-$(CONFIG_KPROBES) += kprobes.o
	obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o		obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o

	@@ -41,7 +40,6 @@ CFLAGS_vsyscall.o := $(PROFILING) -g0
	bootflag-y += ../../i386/kernel/bootflag.o		bootflag-y += ../../i386/kernel/bootflag.o
	cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o		cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
	topology-y += ../../i386/mach-default/topology.o		topology-y += ../../i386/mach-default/topology.o
	swiotlb-$(CONFIG_SWIOTLB) += ../../ia64/lib/swiotlb.o
	microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o		microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
	intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o		intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o
	quirks-y += ../../i386/kernel/quirks.o		quirks-y += ../../i386/kernel/quirks.o