Author: jhb
Date: Tue Jan 20 19:41:18 2009
New Revision: 187480
URL: http://svn.freebsd.org/changeset/base/187480
Log:
MFC: Stop maintaining pv_list_count for i386 and amd64 since it was
obsoleted by Peter's rewrite of the pv entry allocator. To avoid ABI
breakage, the field in 'struct mdpage' has not been removed, but it has
been renamed to 'pv_unused'.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/amd64/amd64/pmap.c
stable/7/sys/amd64/include/pmap.h
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/i386/i386/pmap.c
stable/7/sys/i386/include/pmap.h
Modified: stable/7/sys/amd64/amd64/pmap.c
==============================================================================
--- stable/7/sys/amd64/amd64/pmap.c Tue Jan 20 19:06:10 2009
(r187479)
+++ stable/7/sys/amd64/amd64/pmap.c Tue Jan 20 19:41:18 2009
(r187480)
@@ -601,7 +601,6 @@ pmap_page_init(vm_page_t m)
{
TAILQ_INIT(&m->md.pv_list);
- m->md.pv_list_count = 0;
}
/*
@@ -1694,7 +1693,6 @@ pmap_collect(pmap_t locked_pmap, struct
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
- m->md.pv_list_count--;
free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
@@ -1842,7 +1840,6 @@ pmap_remove_entry(pmap_t pmap, vm_page_t
}
KASSERT(pv != NULL, ("pmap_remove_entry: pv not found"));
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count--;
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
free_pv_entry(pmap, pv);
@@ -1862,7 +1859,6 @@ pmap_insert_entry(pmap_t pmap, vm_offset
pv = get_pv_entry(pmap, FALSE);
pv->pv_va = va;
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count++;
}
/*
@@ -1879,7 +1875,6 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm
(pv = get_pv_entry(pmap, TRUE)) != NULL) {
pv->pv_va = va;
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count++;
return (TRUE);
} else
return (FALSE);
@@ -2119,7 +2114,6 @@ pmap_remove_all(vm_page_t m)
pmap_invalidate_page(pmap, pv->pv_va);
pmap_free_zero_pages(free);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count--;
free_pv_entry(pmap, pv);
PMAP_UNLOCK(pmap);
}
@@ -3029,7 +3023,6 @@ pmap_remove_pages(pmap_t pmap)
PV_STAT(pv_entry_spare++);
pv_entry_count--;
pc->pc_map[field] |= bitmask;
- m->md.pv_list_count--;
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
Modified: stable/7/sys/amd64/include/pmap.h
==============================================================================
--- stable/7/sys/amd64/include/pmap.h Tue Jan 20 19:06:10 2009
(r187479)
+++ stable/7/sys/amd64/include/pmap.h Tue Jan 20 19:41:18 2009
(r187480)
@@ -229,7 +229,7 @@ struct pv_entry;
struct pv_chunk;
struct md_page {
- int pv_list_count;
+ int pv_unused;
TAILQ_HEAD(,pv_entry) pv_list;
};
Modified: stable/7/sys/i386/i386/pmap.c
==============================================================================
--- stable/7/sys/i386/i386/pmap.c Tue Jan 20 19:06:10 2009
(r187479)
+++ stable/7/sys/i386/i386/pmap.c Tue Jan 20 19:41:18 2009
(r187480)
@@ -525,7 +525,6 @@ pmap_page_init(vm_page_t m)
{
TAILQ_INIT(&m->md.pv_list);
- m->md.pv_list_count = 0;
}
#ifdef PAE
@@ -1763,7 +1762,6 @@ pmap_collect(pmap_t locked_pmap, struct
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
- m->md.pv_list_count--;
free_pv_entry(pmap, pv);
if (pmap != locked_pmap)
PMAP_UNLOCK(pmap);
@@ -1918,7 +1916,6 @@ pmap_remove_entry(pmap_t pmap, vm_page_t
}
KASSERT(pv != NULL, ("pmap_remove_entry: pv not found"));
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count--;
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
free_pv_entry(pmap, pv);
@@ -1938,7 +1935,6 @@ pmap_insert_entry(pmap_t pmap, vm_offset
pv = get_pv_entry(pmap, FALSE);
pv->pv_va = va;
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count++;
}
/*
@@ -1955,7 +1951,6 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm
(pv = get_pv_entry(pmap, TRUE)) != NULL) {
pv->pv_va = va;
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count++;
return (TRUE);
} else
return (FALSE);
@@ -2173,7 +2168,6 @@ pmap_remove_all(vm_page_t m)
pmap_invalidate_page(pmap, pv->pv_va);
pmap_free_zero_pages(free);
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
- m->md.pv_list_count--;
free_pv_entry(pmap, pv);
PMAP_UNLOCK(pmap);
}
@@ -3114,7 +3108,6 @@ pmap_remove_pages(pmap_t pmap)
PV_STAT(pv_entry_spare++);
pv_entry_count--;
pc->pc_map[field] |= bitmask;
- m->md.pv_list_count--;
TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
if (TAILQ_EMPTY(&m->md.pv_list))
vm_page_flag_clear(m, PG_WRITEABLE);
Modified: stable/7/sys/i386/include/pmap.h
==============================================================================
--- stable/7/sys/i386/include/pmap.h Tue Jan 20 19:06:10 2009
(r187479)
+++ stable/7/sys/i386/include/pmap.h Tue Jan 20 19:41:18 2009
(r187480)
@@ -316,7 +316,7 @@ struct pv_entry;
struct pv_chunk;
struct md_page {
- int pv_list_count;
+ int pv_unused;
TAILQ_HEAD(,pv_entry) pv_list;
};
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
