summaryrefslogtreecommitdiffstats
path: root/sys/vm
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1998-10-21 14:46:42 +0000
committerdg <dg@FreeBSD.org>1998-10-21 14:46:42 +0000
commit92891f8e3d8fbdfee912c69bf9573707ead0bff0 (patch)
treec4bd98715edf27ea1ebf3efb53bf6a11305437ce /sys/vm
parentf93869e1c489c37b9fe5ebb57746d5ff90573eca (diff)
downloadFreeBSD-src-92891f8e3d8fbdfee912c69bf9573707ead0bff0.zip
FreeBSD-src-92891f8e3d8fbdfee912c69bf9573707ead0bff0.tar.gz
Nuked PG_TABLED flag. Replaced with m->object != NULL.
Diffstat (limited to 'sys/vm')
-rw-r--r--sys/vm/vm_page.c12
-rw-r--r--sys/vm/vm_page.h3
2 files changed, 5 insertions, 10 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 64bf5f8..298b9a3 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91
- * $Id: vm_page.c,v 1.107 1998/09/04 08:06:57 dfr Exp $
+ * $Id: vm_page.c,v 1.108 1998/10/21 11:43:04 dg Exp $
*/
/*
@@ -378,10 +378,8 @@ vm_page_insert(m, object, pindex)
{
register struct pglist *bucket;
-#if !defined(MAX_PERF)
- if (m->flags & PG_TABLED)
+ if (m->object != NULL)
panic("vm_page_insert: already inserted");
-#endif
/*
* Record the object/offset pair in this page
@@ -403,7 +401,6 @@ vm_page_insert(m, object, pindex)
*/
TAILQ_INSERT_TAIL(&object->memq, m, listq);
- vm_page_flag_set(m, PG_TABLED);
m->object->page_hint = m;
m->object->generation++;
@@ -437,7 +434,7 @@ vm_page_remove(m)
register struct pglist *bucket;
vm_object_t object;
- if (!(m->flags & PG_TABLED))
+ if (m->object == NULL)
return;
#if !defined(MAX_PERF)
@@ -482,9 +479,8 @@ vm_page_remove(m)
object->resident_page_count--;
object->generation++;
- m->object = NULL;
- vm_page_flag_clear(m, PG_TABLED);
+ m->object = NULL;
}
/*
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 32c8341..c08602b 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $Id: vm_page.h,v 1.45 1998/09/01 17:12:19 wollman Exp $
+ * $Id: vm_page.h,v 1.46 1998/09/04 08:06:57 dfr Exp $
*/
/*
@@ -203,7 +203,6 @@ extern struct vpgqueues {
*/
#define PG_BUSY 0x01 /* page is in transit (O) */
#define PG_WANTED 0x02 /* someone is waiting for page (O) */
-#define PG_TABLED 0x04 /* page is in an object (O) */
#define PG_FICTITIOUS 0x08 /* physical page doesn't exist (O) */
#define PG_WRITEABLE 0x10 /* page is mapped writeable */
#define PG_MAPPED 0x20 /* page is mapped */
OpenPOWER on IntegriCloud