summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/consistent.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2009-10-06 21:22:30 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-10-10 21:52:03 +0900
commit3105121949b609964f370d42d1b90fe7fc01d6b1 (patch)
tree20a7a6afa6d8023d20dcc7509a253268e0afdebc /arch/sh/mm/consistent.c
parentedd7de803c79c7df117bf3f0e22ffdba1b1ef256 (diff)
downloadlinux-3105121949b609964f370d42d1b90fe7fc01d6b1.tar.gz
linux-3105121949b609964f370d42d1b90fe7fc01d6b1.tar.bz2
linux-3105121949b609964f370d42d1b90fe7fc01d6b1.zip
sh: Remap physical memory into P1 and P2 in pmb_init()
Eventually we'll have complete control over what physical memory gets mapped where and we can probably do other interesting things. For now though, when the MMU is in 32-bit mode, we map physical memory into the P1 and P2 virtual address ranges with the same semantics as they have in 29-bit mode. Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/consistent.c')
-rw-r--r--arch/sh/mm/consistent.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index e098ec158ddb..9a8403d9344b 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -85,7 +85,7 @@ EXPORT_SYMBOL(dma_free_coherent);
void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
-#ifdef CONFIG_CPU_SH5
+#if defined(CONFIG_CPU_SH5) || defined(CONFIG_PMB)
void *p1addr = vaddr;
#else
void *p1addr = (void*) P1SEGADDR((unsigned long)vaddr);