Commit 049aa166 authored by Paul Mundt's avatar Paul Mundt

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 749c8496
...@@ -25,7 +25,7 @@ obj-$(CONFIG_SH_DMA) += dma.o ...@@ -25,7 +25,7 @@ obj-$(CONFIG_SH_DMA) += dma.o
obj-$(CONFIG_SH_FPU) += fpu.o obj-$(CONFIG_SH_FPU) += fpu.o
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
obj-$(CONFIG_KALLSYMS) += unwind.o obj-$(CONFIG_KALLSYMS) += unwind.o
obj-$(CONFIG_PCI) += pci-dma.o pcibios.o obj-$(CONFIG_PCI) += pcibios.o
obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULES) += module.o
ifeq ($(CONFIG_PCI),y) ifeq ($(CONFIG_PCI),y)
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
# unless it's something special (ie not a .c file). # 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 obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
...@@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \ ...@@ -41,4 +42,3 @@ CFLAGS_tlbmiss.o += -ffixed-r7 \
-ffixed-r41 -ffixed-r42 -ffixed-r43 \ -ffixed-r41 -ffixed-r42 -ffixed-r43 \
-ffixed-r60 -ffixed-r61 -ffixed-r62 \ -ffixed-r60 -ffixed-r61 -ffixed-r62 \
-fomit-frame-pointer -fomit-frame-pointer
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment