From 95f67de2e334fdac03ae9171fe01d6fd806cfbea Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Mon, 19 Jan 1998 04:16:16 +0000 Subject: [PATCH] The removal of a page from the free queue in vm_page_zero_idle was imcomplete. Also set m->queue, in order to prevent vm_page_select_free from selecting the page being zeroed. --- sys/amd64/amd64/vm_machdep.c | 3 ++- sys/i386/i386/vm_machdep.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c index 0597ca48d29..6753158a39b 100644 --- a/sys/amd64/amd64/vm_machdep.c +++ b/sys/amd64/amd64/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.93 1997/12/27 02:28:28 peter Exp $ + * $Id: vm_machdep.c,v 1.94 1998/01/15 07:32:21 gibbs Exp $ */ #include "npx.h" @@ -941,6 +941,7 @@ vm_page_zero_idle() if (m != NULL) { --(*vm_page_queues[m->queue].lcnt); TAILQ_REMOVE(vm_page_queues[m->queue].pl, m, pageq); + m->queue = PQ_NONE; splx(s); #ifdef SMP rel_mplock(); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index 0597ca48d29..6753158a39b 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $Id: vm_machdep.c,v 1.93 1997/12/27 02:28:28 peter Exp $ + * $Id: vm_machdep.c,v 1.94 1998/01/15 07:32:21 gibbs Exp $ */ #include "npx.h" @@ -941,6 +941,7 @@ vm_page_zero_idle() if (m != NULL) { --(*vm_page_queues[m->queue].lcnt); TAILQ_REMOVE(vm_page_queues[m->queue].pl, m, pageq); + m->queue = PQ_NONE; splx(s); #ifdef SMP rel_mplock();