aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/cache-sh4.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-03-31 08:10:55 +0100
committerGrant Likely <grant.likely@linaro.org>2014-03-31 08:10:55 +0100
commitd88cf7d7b4240b8df170ba105e414e476fb51cce (patch)
tree7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /arch/sh/mm/cache-sh4.c
parentof: Add support for ePAPR "stdout-path" property (diff)
parentof: add missing major vendors (diff)
downloadlinux-dev-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.xz
linux-dev-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'arch/sh/mm/cache-sh4.c')
-rw-r--r--arch/sh/mm/cache-sh4.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 0e529285b28d..51d8f7f31d1d 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -133,9 +133,9 @@ static void flush_icache_all(void)
jump_to_uncached();
/* Flush I-cache */
- ccr = __raw_readl(CCR);
+ ccr = __raw_readl(SH_CCR);
ccr |= CCR_CACHE_ICI;
- __raw_writel(ccr, CCR);
+ __raw_writel(ccr, SH_CCR);
/*
* back_to_cached() will take care of the barrier for us, don't add