Module Name: src Committed By: matt Date: Tue Dec 27 16:08:17 UTC 2011
Modified Files: src/sys/arch/mips/mips [matt-nb5-mips64]: cache.c Log Message: Use MIPS_*CACHE_VIRTUAL_ALIAS instead of mci->mci_* To generate a diff of this commit: cvs rdiff -u -r1.33.96.9 -r1.33.96.10 src/sys/arch/mips/mips/cache.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/mips/mips/cache.c diff -u src/sys/arch/mips/mips/cache.c:1.33.96.9 src/sys/arch/mips/mips/cache.c:1.33.96.10 --- src/sys/arch/mips/mips/cache.c:1.33.96.9 Tue Dec 27 03:39:40 2011 +++ src/sys/arch/mips/mips/cache.c Tue Dec 27 16:08:17 2011 @@ -1191,10 +1191,10 @@ mips_config_cache_modern(uint32_t cpu_id mci->mci_pdcache_write_through = true; mci->mci_sdcache_write_through = false; KASSERT(PAGE_SIZE >= mci->mci_picache_way_size - || mci->mci_icache_virtual_alias); + || MIPS_ICACHE_VIRTUAL_ALIAS); } else { - KASSERT(mci->mci_icache_virtual_alias == 0); - KASSERT(mci->mci_icache_virtual_alias == 0); + KASSERT(MIPS_CACHE_VIRTUAL_ALIAS == 0); + KASSERT(MIPS_ICACHE_VIRTUAL_ALIAS == 0); } #if (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0 } else if (MIPS_PRID_CID(cpu_id) == MIPS_PRID_CID_MTI) {