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

Commit 6c654b5f authored by John W. Linville's avatar John W. Linville Committed by Tony Luck
Browse files

[PATCH] swiotlb: move from arch/ia64/lib/ to lib/ 



The swiotlb implementation is shared by both IA-64 and EM64T. However,
the source itself lives under arch/ia64. This patch moves swiotlb.c
from arch/ia64/lib to lib/ and fixes-up the appropriate Makefile and
Kconfig files. No actual changes are made to swiotlb.c.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 0b9afede

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

arch/ia64/lib/Makefile

+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

arch/x86_64/kernel/Makefile

+0 −2
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

lib/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,8 @@ obj-$(CONFIG_TEXTSEARCH_KMP) += ts_kmp.o 
obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o

obj-$(CONFIG_TEXTSEARCH_BM) += ts_bm.o

obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o

obj-$(CONFIG_TEXTSEARCH_FSM) += ts_fsm.o





obj-$(CONFIG_SWIOTLB) += swiotlb.o



hostprogs-y	:= gen_crc32table

hostprogs-y	:= gen_crc32table

clean-files	:= crc32table.h

clean-files	:= crc32table.h

arch/ia64/lib/swiotlb.c→lib/swiotlb.c

+0 −0

File moved.

View file