Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / sh / mm / cache-sh3.c

diff --git a/arch/sh/mm/cache-sh3.c b/arch/sh/mm/cache-sh3.c
index faef80c..e37523f 100644 (file)
--- a/arch/sh/mm/cache-sh3.c
+++ b/arch/sh/mm/cache-sh3.c
@@ -50,12 +50,12 @@ static void sh3__flush_wback_region(void *start, int size)
                        p = __pa(v);
                        addr = addrstart | (v & current_cpu_data.dcache.entry_mask);
                        local_irq_save(flags);
-                       data = ctrl_inl(addr);
+                       data = __raw_readl(addr);
 
                        if ((data & CACHE_PHYSADDR_MASK) ==
                            (p & CACHE_PHYSADDR_MASK)) {
                                data &= ~SH_CACHE_UPDATED;
-                               ctrl_outl(data, addr);
+                               __raw_writel(data, addr);
                                local_irq_restore(flags);
                                break;
                        }
@@ -86,7 +86,7 @@ static void sh3__flush_purge_region(void *start, int size)
                data = (v & 0xfffffc00); /* _Virtual_ address, ~U, ~V */
                addr = CACHE_OC_ADDRESS_ARRAY |
                        (v & current_cpu_data.dcache.entry_mask) | SH_CACHE_ASSOC;
-               ctrl_outl(data, addr);
+               __raw_writel(data, addr);
        }
 }