CVS Update@linux-mips.org: linux

[ths@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ths@ftp.linux-mips.org  05/09/09 21:26:57

Modified files:
        arch/mips/mm   : c-r4k.c pg-r4k.c 

Log message:
        Add/Fix missing bit of R4600 hit cacheop workaround.

diff -urN linux/arch/mips/mm/c-r4k.c linux/arch/mips/mm/c-r4k.c
--- linux/arch/mips/mm/c-r4k.c  2005/09/09 19:45:41     1.118
+++ linux/arch/mips/mm/c-r4k.c  2005/09/09 20:26:54     1.119
@@ -481,6 +481,7 @@
                if (end - start > dcache_size) {
                        r4k_blast_dcache();
                } else {
+                       R4600_HIT_CACHEOP_WAR_IMPL;
                        addr = start & ~(dc_lsize - 1);
                        aend = (end - 1) & ~(dc_lsize - 1);
 
diff -urN linux/arch/mips/mm/pg-r4k.c linux/arch/mips/mm/pg-r4k.c
--- linux/arch/mips/mm/pg-r4k.c 2005/09/02 12:18:30     1.19
+++ linux/arch/mips/mm/pg-r4k.c 2005/09/09 20:26:54     1.20
@@ -209,7 +209,7 @@
        }
 
        if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
-               build_insn_word(0x8c200000);    /* lw      $zero, ($at) */
+               build_insn_word(0x3c01a000);    /* lui     $at, 0xa000  */
 
        mi.c_format.opcode     = cache_op;
        mi.c_format.rs         = 4;             /* $a0 */