Author: alc
Date: Thu Dec 15 05:07:16 2011
New Revision: 228522
URL: http://svn.freebsd.org/changeset/base/228522
Log:
Eliminate vestiges of page coloring.
Modified:
head/sys/arm/arm/vm_machdep.c
head/sys/dev/ti/if_ti.c
head/sys/i386/xen/mp_machdep.c
head/sys/ia64/ia64/uma_machdep.c
head/sys/powerpc/aim/mmu_oea64.c
head/sys/powerpc/aim/uma_machdep.c
head/sys/sparc64/sparc64/vm_machdep.c
Modified: head/sys/arm/arm/vm_machdep.c
==============================================================================
--- head/sys/arm/arm/vm_machdep.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/arm/arm/vm_machdep.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -617,7 +617,6 @@ uma_small_alloc(uma_zone_t zone, int byt
void *ret;
struct arm_small_page *sp;
TAILQ_HEAD(,arm_small_page) *head;
- static vm_pindex_t color;
vm_page_t m;
*flags = UMA_SLAB_PRIV;
@@ -650,8 +649,7 @@ uma_small_alloc(uma_zone_t zone, int byt
if (wait & M_ZERO)
pflags |= VM_ALLOC_ZERO;
for (;;) {
- m = vm_page_alloc(NULL, color++,
- pflags | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (wait & M_NOWAIT)
return (NULL);
Modified: head/sys/dev/ti/if_ti.c
==============================================================================
--- head/sys/dev/ti/if_ti.c Thu Dec 15 03:13:23 2011 (r228521)
+++ head/sys/dev/ti/if_ti.c Thu Dec 15 05:07:16 2011 (r228522)
@@ -1562,7 +1562,6 @@ ti_newbuf_jumbo(struct ti_softc *sc, int
struct mbuf *m[3] = {NULL, NULL, NULL};
struct ti_rx_desc_ext *r;
vm_page_t frame;
- static int color;
/* 1 extra buf to make nobufs easy*/
struct sf_buf *sf[3] = {NULL, NULL, NULL};
int i;
@@ -1605,7 +1604,7 @@ ti_newbuf_jumbo(struct ti_softc *sc, int
"failed -- packet dropped!\n");
goto nobufs;
}
- frame = vm_page_alloc(NULL, color++,
+ frame = vm_page_alloc(NULL, 0,
VM_ALLOC_INTERRUPT | VM_ALLOC_NOOBJ |
VM_ALLOC_WIRED);
if (frame == NULL) {
Modified: head/sys/i386/xen/mp_machdep.c
==============================================================================
--- head/sys/i386/xen/mp_machdep.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/i386/xen/mp_machdep.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -815,7 +815,6 @@ cpu_initialize_context(unsigned int cpu)
vm_offset_t boot_stack;
vm_offset_t newPTD;
vm_paddr_t ma[NPGPTD];
- static int color;
int i;
/*
@@ -825,7 +824,7 @@ cpu_initialize_context(unsigned int cpu)
*
*/
for (i = 0; i < NPGPTD + 2; i++) {
- m[i] = vm_page_alloc(NULL, color++,
+ m[i] = vm_page_alloc(NULL, 0,
VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ | VM_ALLOC_WIRED |
VM_ALLOC_ZERO);
Modified: head/sys/ia64/ia64/uma_machdep.c
==============================================================================
--- head/sys/ia64/ia64/uma_machdep.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/ia64/ia64/uma_machdep.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
void *
uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
{
- static vm_pindex_t color;
void *va;
vm_page_t m;
int pflags;
@@ -55,7 +54,7 @@ uma_small_alloc(uma_zone_t zone, int byt
pflags |= VM_ALLOC_ZERO;
for (;;) {
- m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (wait & M_NOWAIT)
return (NULL);
Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/powerpc/aim/mmu_oea64.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -1402,7 +1402,6 @@ moea64_uma_page_alloc(uma_zone_t zone, i
* kmem allocation routines, calling kmem for a new address here
* can lead to multiply locking non-recursive mutexes.
*/
- static vm_pindex_t color;
vm_offset_t va;
vm_page_t m;
@@ -1422,7 +1421,7 @@ moea64_uma_page_alloc(uma_zone_t zone, i
pflags |= VM_ALLOC_ZERO;
for (;;) {
- m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (wait & M_NOWAIT)
return (NULL);
Modified: head/sys/powerpc/aim/uma_machdep.c
==============================================================================
--- head/sys/powerpc/aim/uma_machdep.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/powerpc/aim/uma_machdep.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -51,7 +51,6 @@ SYSCTL_INT(_hw, OID_AUTO, uma_mdpages, C
void *
uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
{
- static vm_pindex_t color;
void *va;
vm_page_t m;
int pflags;
@@ -65,7 +64,7 @@ uma_small_alloc(uma_zone_t zone, int byt
pflags |= VM_ALLOC_ZERO;
for (;;) {
- m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (wait & M_NOWAIT)
return (NULL);
Modified: head/sys/sparc64/sparc64/vm_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/vm_machdep.c Thu Dec 15 03:13:23 2011
(r228521)
+++ head/sys/sparc64/sparc64/vm_machdep.c Thu Dec 15 05:07:16 2011
(r228522)
@@ -493,7 +493,6 @@ swi_vm(void *v)
void *
uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
{
- static vm_pindex_t color;
vm_paddr_t pa;
vm_page_t m;
int pflags;
@@ -512,7 +511,7 @@ uma_small_alloc(uma_zone_t zone, int byt
pflags |= VM_ALLOC_ZERO;
for (;;) {
- m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, 0, pflags | VM_ALLOC_NOOBJ);
if (m == NULL) {
if (wait & M_NOWAIT)
return (NULL);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
