From 9b7c776aa5c6aa30a05e3bd39901e169f4fb0d15 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Tue, 25 May 2004 18:28:52 +0000
Subject: Back out previous commit; it went to the wrong file.

---
 sys/vm/vm_map.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'sys/vm/vm_map.c')

diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index a7075a9..d27df6f 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -78,8 +78,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/file.h>
 #include <sys/sysent.h>
 #include <sys/shm.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -150,10 +148,6 @@ static void vm_map_zdtor(void *mem, int size, void *arg);
 static void vmspace_zdtor(void *mem, int size, void *arg);
 #endif
 
-static int old_msync;
-SYSCTL_INT(_vm, OID_AUTO, old_msync, CTLFLAG_RW, &old_msync, 0,
-    "Use old (insecure) msync behavior");
-
 void
 vm_map_startup(void)
 {
@@ -2092,8 +2086,7 @@ vm_map_entry_delete(vm_map_t map, vm_map_entry_t entry)
 		     object == kernel_object || object == kmem_object) &&
 		    (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) {
 			vm_object_collapse(object);
-			vm_object_page_remove(object, offidxstart, offidxend,
-			    old_msync ? FALSE : TRUE);
+			vm_object_page_remove(object, offidxstart, offidxend, FALSE);
 			if (object->type == OBJT_SWAP)
 				swap_pager_freespace(object, offidxstart, count);
 			if (offidxend >= object->size &&
-- 
cgit v1.1