Date: Thu, 14 Apr 2011 18:26:50 +0000 (UTC) From: Andreas Tobler <andreast@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220639 - head/sys/powerpc/aim Message-ID: <201104141826.p3EIQoHO043549@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andreast Date: Thu Apr 14 18:26:50 2011 New Revision: 220639 URL: http://svn.freebsd.org/changeset/base/220639 Log: The macro MOEA_PVO_CHECK is empty and not used. It is a left over from the NetBSD import. Remove the definition and all its occurrences. Approved by: nwhitehorn (mentor) Modified: head/sys/powerpc/aim/mmu_oea.c head/sys/powerpc/aim/mmu_oea64.c Modified: head/sys/powerpc/aim/mmu_oea.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea.c Thu Apr 14 18:14:43 2011 (r220638) +++ head/sys/powerpc/aim/mmu_oea.c Thu Apr 14 18:26:50 2011 (r220639) @@ -161,8 +161,6 @@ __FBSDID("$FreeBSD$"); #define VSID_TO_SR(vsid) ((vsid) & 0xf) #define VSID_TO_HASH(vsid) (((vsid) >> 4) & 0xfffff) -#define MOEA_PVO_CHECK(pvo) - struct ofw_map { vm_offset_t om_va; vm_size_t om_len; @@ -1809,7 +1807,6 @@ moea_remove_all(mmu_t mmu, vm_page_t m) for (pvo = LIST_FIRST(pvo_head); pvo != NULL; pvo = next_pvo) { next_pvo = LIST_NEXT(pvo, pvo_vlink); - MOEA_PVO_CHECK(pvo); /* sanity check */ pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); moea_pvo_remove(pvo, -1); @@ -2163,7 +2160,6 @@ moea_pte_spill(vm_offset_t addr) /* * We need to find a pvo entry for this address. */ - MOEA_PVO_CHECK(pvo); if (source_pvo == NULL && moea_pte_match(&pvo->pvo_pte.pte, sr, addr, pvo->pvo_pte.pte.pte_hi & PTE_HID)) { @@ -2176,7 +2172,6 @@ moea_pte_spill(vm_offset_t addr) if (j >= 0) { PVO_PTEGIDX_SET(pvo, j); moea_pte_overflow--; - MOEA_PVO_CHECK(pvo); mtx_unlock(&moea_table_mutex); return (1); } @@ -2215,7 +2210,6 @@ moea_pte_spill(vm_offset_t addr) */ LIST_FOREACH(pvo, &moea_pvo_table[ptegidx ^ moea_pteg_mask], pvo_olink) { - MOEA_PVO_CHECK(pvo); /* * We also need the pvo entry of the victim we are * replacing so save the R & C bits of the PTE. @@ -2245,9 +2239,6 @@ moea_pte_spill(vm_offset_t addr) PVO_PTEGIDX_SET(source_pvo, i); moea_pte_replacements++; - MOEA_PVO_CHECK(victim_pvo); - MOEA_PVO_CHECK(source_pvo); - mtx_unlock(&moea_table_mutex); return (1); } @@ -2299,7 +2290,6 @@ moea_query_bit(vm_page_t m, int ptebit) vm_page_lock_queues(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ /* * See if we saved the bit off. If so, cache it and return @@ -2307,7 +2297,6 @@ moea_query_bit(vm_page_t m, int ptebit) */ if (pvo->pvo_pte.pte.pte_lo & ptebit) { moea_attr_save(m, ptebit); - MOEA_PVO_CHECK(pvo); /* sanity check */ vm_page_unlock_queues(); return (TRUE); } @@ -2320,7 +2309,6 @@ moea_query_bit(vm_page_t m, int ptebit) */ powerpc_sync(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ /* * See if this pvo has a valid PTE. if so, fetch the @@ -2333,7 +2321,6 @@ moea_query_bit(vm_page_t m, int ptebit) mtx_unlock(&moea_table_mutex); if (pvo->pvo_pte.pte.pte_lo & ptebit) { moea_attr_save(m, ptebit); - MOEA_PVO_CHECK(pvo); /* sanity check */ vm_page_unlock_queues(); return (TRUE); } @@ -2373,7 +2360,6 @@ moea_clear_bit(vm_page_t m, int ptebit) */ count = 0; LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ pt = moea_pvo_to_pte(pvo, -1); if (pt != NULL) { moea_pte_synch(pt, &pvo->pvo_pte.pte); @@ -2384,7 +2370,6 @@ moea_clear_bit(vm_page_t m, int ptebit) mtx_unlock(&moea_table_mutex); } pvo->pvo_pte.pte.pte_lo &= ~ptebit; - MOEA_PVO_CHECK(pvo); /* sanity check */ } vm_page_unlock_queues(); Modified: head/sys/powerpc/aim/mmu_oea64.c ============================================================================== --- head/sys/powerpc/aim/mmu_oea64.c Thu Apr 14 18:14:43 2011 (r220638) +++ head/sys/powerpc/aim/mmu_oea64.c Thu Apr 14 18:26:50 2011 (r220639) @@ -169,8 +169,6 @@ uintptr_t moea64_get_unique_vsid(void); #define VSID_TO_HASH(vsid) (((vsid) >> 4) & 0xfffff) #define VSID_HASH_MASK 0x0000007fffffffffULL -#define MOEA_PVO_CHECK(pvo) - #define LOCK_TABLE() mtx_lock(&moea64_table_mutex) #define UNLOCK_TABLE() mtx_unlock(&moea64_table_mutex); #define ASSERT_TABLE_LOCK() mtx_assert(&moea64_table_mutex, MA_OWNED) @@ -2084,7 +2082,6 @@ moea64_remove_all(mmu_t mmu, vm_page_t m for (pvo = LIST_FIRST(pvo_head); pvo != NULL; pvo = next_pvo) { next_pvo = LIST_NEXT(pvo, pvo_vlink); - MOEA_PVO_CHECK(pvo); /* sanity check */ pmap = pvo->pvo_pmap; PMAP_LOCK(pmap); moea64_pvo_remove(mmu, pvo); @@ -2413,7 +2410,6 @@ moea64_query_bit(mmu_t mmu, vm_page_t m, vm_page_lock_queues(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ /* * See if we saved the bit off. If so, cache it and return @@ -2421,7 +2417,6 @@ moea64_query_bit(mmu_t mmu, vm_page_t m, */ if (pvo->pvo_pte.lpte.pte_lo & ptebit) { moea64_attr_save(m, ptebit); - MOEA_PVO_CHECK(pvo); /* sanity check */ vm_page_unlock_queues(); return (TRUE); } @@ -2434,7 +2429,6 @@ moea64_query_bit(mmu_t mmu, vm_page_t m, */ powerpc_sync(); LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ /* * See if this pvo has a valid PTE. if so, fetch the @@ -2449,7 +2443,6 @@ moea64_query_bit(mmu_t mmu, vm_page_t m, UNLOCK_TABLE(); moea64_attr_save(m, ptebit); - MOEA_PVO_CHECK(pvo); /* sanity check */ vm_page_unlock_queues(); return (TRUE); } @@ -2490,7 +2483,6 @@ moea64_clear_bit(mmu_t mmu, vm_page_t m, */ count = 0; LIST_FOREACH(pvo, vm_page_to_pvoh(m), pvo_vlink) { - MOEA_PVO_CHECK(pvo); /* sanity check */ LOCK_TABLE(); pt = MOEA64_PVO_TO_PTE(mmu, pvo); @@ -2503,7 +2495,6 @@ moea64_clear_bit(mmu_t mmu, vm_page_t m, } } pvo->pvo_pte.lpte.pte_lo &= ~ptebit; - MOEA_PVO_CHECK(pvo); /* sanity check */ UNLOCK_TABLE(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104141826.p3EIQoHO043549>