Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

[linux-2.6] / arch / mips / mm / c-tx39.c

diff --git a/arch/mips/mm/c-tx39.c b/arch/mips/mm/c-tx39.c
index b09d569..f7c8f9c 100644 (file)
--- a/arch/mips/mm/c-tx39.c
+++ b/arch/mips/mm/c-tx39.c
@@ -122,6 +122,16 @@ static inline void tx39_blast_icache(void)
        local_irq_restore(flags);
 }
 
+static void tx39__flush_cache_vmap(void)
+{
+       tx39_blast_dcache();
+}
+
+static void tx39__flush_cache_vunmap(void)
+{
+       tx39_blast_dcache();
+}
+
 static inline void tx39_flush_cache_all(void)
 {
        if (!cpu_has_dc_aliases)
@@ -344,12 +354,15 @@ void __cpuinit tx39_cache_init(void)
        switch (current_cpu_type()) {
        case CPU_TX3912:
                /* TX39/H core (writethru direct-map cache) */
+               __flush_cache_vmap      = tx39__flush_cache_vmap;
+               __flush_cache_vunmap    = tx39__flush_cache_vunmap;
                flush_cache_all = tx39h_flush_icache_all;
                __flush_cache_all       = tx39h_flush_icache_all;
                flush_cache_mm          = (void *) tx39h_flush_icache_all;
                flush_cache_range       = (void *) tx39h_flush_icache_all;
                flush_cache_page        = (void *) tx39h_flush_icache_all;
                flush_icache_range      = (void *) tx39h_flush_icache_all;
+               local_flush_icache_range = (void *) tx39h_flush_icache_all;
 
                flush_cache_sigtramp    = (void *) tx39h_flush_icache_all;
                local_flush_data_cache_page     = (void *) tx39h_flush_icache_all;
@@ -369,12 +382,16 @@ void __cpuinit tx39_cache_init(void)
                write_c0_wired(0);      /* set 8 on reset... */
                /* board-dependent init code may set WBON */
 
+               __flush_cache_vmap      = tx39__flush_cache_vmap;
+               __flush_cache_vunmap    = tx39__flush_cache_vunmap;
+
                flush_cache_all = tx39_flush_cache_all;
                __flush_cache_all = tx39___flush_cache_all;
                flush_cache_mm = tx39_flush_cache_mm;
                flush_cache_range = tx39_flush_cache_range;
                flush_cache_page = tx39_flush_cache_page;
                flush_icache_range = tx39_flush_icache_range;
+               local_flush_icache_range = tx39_flush_icache_range;
 
                flush_cache_sigtramp = tx39_flush_cache_sigtramp;
                local_flush_data_cache_page = local_tx39_flush_data_cache_page;