Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

MIPS: Rename the "Fill" cache ops to avoid build failure

MIPS define a "Fill" macro as a cache operation in cacheops.h, this
will cause build failure under some special configurations because in
seq_file.c there is a "Fill" label. To avoid this failure we rename the
"Fill" macro to "Fill_I" which has the same coding style as other cache
operations in cacheops.h (we think renaming the "Fill" macro is more
reasonable than renaming the "Fill" label).

Callers of "Fill" macro is also updated.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by

Huacai Chen and committed by
Thomas Bogendoerfer
a44f8309 c213db61

+3 -3
+1 -1
arch/mips/include/asm/cacheops.h
··· 48 48 * R4000-specific cacheops 49 49 */ 50 50 #define Create_Dirty_Excl_D (Cache_D | 0x0c) 51 - #define Fill (Cache_I | 0x14) 51 + #define Fill_I (Cache_I | 0x14) 52 52 #define Hit_Writeback_I (Cache_I | Hit_Writeback) 53 53 #define Hit_Writeback_D (Cache_D | Hit_Writeback) 54 54
+1 -1
arch/mips/mm/c-r4k.c
··· 1049 1049 "cache\t%1, 0x3000(%0)\n\t" 1050 1050 ".set pop\n" 1051 1051 : 1052 - : "r" (addr), "i" (Index_Store_Tag_I), "i" (Fill)); 1052 + : "r" (addr), "i" (Index_Store_Tag_I), "i" (Fill_I)); 1053 1053 } 1054 1054 } 1055 1055
+1 -1
arch/mips/pmcs-msp71xx/msp_setup.c
··· 55 55 56 56 for (iptr = (void *)((unsigned int)start & ~(L1_CACHE_BYTES - 1)); 57 57 iptr < end; iptr += L1_CACHE_BYTES) 58 - cache_op(Fill, iptr); 58 + cache_op(Fill_I, iptr); 59 59 60 60 __asm__ __volatile__ ( 61 61 "startpoint: \n"