From 049aa166b112beab77b9a2f8d9caa03b74843eab Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 1 Oct 2007 17:43:11 +0900 Subject: [PATCH] sh64: Move consistent DMA routines to arch/sh64/mm/. The consistent DMA stuff was evolved from the old PCI DMA mapping functions. As this has been overhauled, it's something that is used by the generic DMA mapping code, and thus, has no intrinsic PCI dependence. Move the routines somewhere more sensible (same place as sh), and fix up the build for CONFIG_PCI=n in the process. Signed-off-by: Paul Mundt --- arch/sh64/kernel/Makefile | 2 +- arch/sh64/mm/Makefile | 4 ++-- arch/sh64/{kernel/pci-dma.c => mm/consistent.c} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename arch/sh64/{kernel/pci-dma.c => mm/consistent.c} (100%) diff --git a/arch/sh64/kernel/Makefile b/arch/sh64/kernel/Makefile index 5816657c07..e3467bda61 100644 --- a/arch/sh64/kernel/Makefile +++ b/arch/sh64/kernel/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_SH_DMA) += dma.o obj-$(CONFIG_SH_FPU) += fpu.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_KALLSYMS) += unwind.o -obj-$(CONFIG_PCI) += pci-dma.o pcibios.o +obj-$(CONFIG_PCI) += pcibios.o obj-$(CONFIG_MODULES) += module.o ifeq ($(CONFIG_PCI),y) diff --git a/arch/sh64/mm/Makefile b/arch/sh64/mm/Makefile index ff19378ac9..d0e8136324 100644 --- a/arch/sh64/mm/Makefile +++ b/arch/sh64/mm/Makefile @@ -13,7 +13,8 @@ # unless it's something special (ie not a .c file). # -obj-y := init.o fault.o ioremap.o extable.o cache.o tlbmiss.o tlb.o +obj-y := cache.o consistent.o extable.o fault.o init.o ioremap.o \ + tlbmiss.o tlb.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o @@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \ -ffixed-r41 -ffixed-r42 -ffixed-r43 \ -ffixed-r60 -ffixed-r61 -ffixed-r62 \ -fomit-frame-pointer - diff --git a/arch/sh64/kernel/pci-dma.c b/arch/sh64/mm/consistent.c similarity index 100% rename from arch/sh64/kernel/pci-dma.c rename to arch/sh64/mm/consistent.c -- 2.39.5