MIPS: R46000: Fix Micro-assembler field overflow for R4600 V2
authorThomas Bogendoerfer <tsbogend@alpha.franken.de>
Tue, 8 Apr 2014 06:58:01 +0000 (08:58 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 28 May 2014 09:08:14 +0000 (11:08 +0200)
Fix uasm warning, which triggered because of workaround for R4600 V2 CPUs.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6716/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mm/page.c

index 58033c44690d75db10637e757168f96b5bb5dea7..b611102e23b5c72948ef5c5b8c1e12d603a0ff15 100644 (file)
@@ -273,7 +273,7 @@ void build_clear_page(void)
                uasm_i_ori(&buf, A2, A0, off);
 
        if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
-               uasm_i_lui(&buf, AT, 0xa000);
+               uasm_i_lui(&buf, AT, uasm_rel_hi(0xa0000000));
 
        off = cache_line_size ? min(8, pref_bias_clear_store / cache_line_size)
                                * cache_line_size : 0;
@@ -424,7 +424,7 @@ void build_copy_page(void)
                uasm_i_ori(&buf, A2, A0, off);
 
        if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x())
-               uasm_i_lui(&buf, AT, 0xa000);
+               uasm_i_lui(&buf, AT, uasm_rel_hi(0xa0000000));
 
        off = cache_line_size ? min(8, pref_bias_copy_load / cache_line_size) *
                                cache_line_size : 0;