From 518538603d8e5adbf7c4d542bfebf24167c33311 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 3 Jun 2007 19:39:38 +0000 Subject: [PATCH] Prepare for the new physical memory allocator: Change the way that the physical page's color is obtained. Approved by: re --- sys/sparc64/sparc64/pmap.c | 2 +- sys/sparc64/sparc64/tsb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c index bf0cb0bdcb0f..58d96dbaa25a 100644 --- a/sys/sparc64/sparc64/pmap.c +++ b/sys/sparc64/sparc64/pmap.c @@ -830,7 +830,7 @@ pmap_kenter(vm_offset_t va, vm_page_t m) tp = tsb_kvtotte(va); CTR4(KTR_PMAP, "pmap_kenter: va=%#lx pa=%#lx tp=%p data=%#lx", va, VM_PAGE_TO_PHYS(m), tp, tp->tte_data); - if (m->pc != DCACHE_COLOR(va)) { + if (DCACHE_COLOR(VM_PAGE_TO_PHYS(m)) != DCACHE_COLOR(va)) { CTR6(KTR_CT2, "pmap_kenter: off colour va=%#lx pa=%#lx o=%p oc=%#lx ot=%d pi=%#lx", va, VM_PAGE_TO_PHYS(m), m->object, diff --git a/sys/sparc64/sparc64/tsb.c b/sys/sparc64/sparc64/tsb.c index 8c381cbd215e..86c14264ddd7 100644 --- a/sys/sparc64/sparc64/tsb.c +++ b/sys/sparc64/sparc64/tsb.c @@ -117,7 +117,7 @@ tsb_tte_enter(pmap_t pm, vm_page_t m, vm_offset_t va, u_long sz, u_long data) int b0; int i; - if (m->pc != DCACHE_COLOR(va)) { + if (DCACHE_COLOR(VM_PAGE_TO_PHYS(m)) != DCACHE_COLOR(va)) { CTR6(KTR_CT2, "tsb_tte_enter: off colour va=%#lx pa=%#lx o=%p oc=%#lx ot=%d pi=%#lx", va, VM_PAGE_TO_PHYS(m), m->object,