Remove deprecated external memory management interface.

* NEWS: Update.
* device/dev_pager.c (device_pager_data_request): Prune unused branch.
(device_pager_data_request_done): Remove function.
(device_pager_data_write): Likewise.
(device_pager_data_write_done): Likewise.
(device_pager_copy): Use 'memory_object_ready'.
* device/dev_pager.h (device_pager_data_write_done): Remove prototype.
* device/device_pager.srv (memory_object_data_write): Remove macro.
* doc/mach.texi: Update documentation.
* include/mach/mach.defs (memory_object_data_provided): Drop RPC.
(memory_object_set_attributes): Likewise.
* include/mach/memory_object.defs: Update comments.
(memory_object_data_write): Drop RPC.
* include/mach/memory_object_default.defs: Update comments.
* include/mach_debug/vm_info.h (VOI_STATE_USE_OLD_PAGEOUT): Drop
macro.
* vm/memory_object.c (memory_object_data_provided): Remove function.
(memory_object_data_error): Simplify.
(memory_object_set_attributes_common): Make static, remove unused
parameters, simplify.
(memory_object_change_attributes): Update callsite.
(memory_object_set_attributes): Remove function.
(memory_object_ready): Update callsite.
* vm/vm_debug.c (mach_vm_object_info): Adapt to the changes.
* vm/vm_object.c (vm_object_bootstrap): Likewise.
* vm/vm_object.h (struct vm_object): Drop flag 'use_old_pageout'.
* vm/vm_pageout.c: Update comments.
(vm_pageout_page): Simplify.

1 files changed, 6 insertions, 7 deletions

diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
index dd0f995c..85db021e 100644
--- a/vm/vm_pageout.c
+++ b/vm/vm_pageout.c
@@ -72,7 +72,7 @@ static int vm_pageout_continue;
  *
  *		Move or copy the page to a new object, as part
  *		of which it will be sent to its memory manager
- *		in a memory_object_data_write or memory_object_initialize
+ *		in a memory_object_data_return or memory_object_initialize
  *		message.
  *
  *		The "paging_offset" argument specifies the offset
@@ -95,7 +95,7 @@ static int vm_pageout_continue;
  *		this routine returns a pointer to a place-holder page,
  *		inserted at the same offset, to block out-of-order
  *		requests for the page.  The place-holder page must
- *		be freed after the data_write or initialize message
+ *		be freed after the data_return or initialize message
  *		has been sent.  If the page is copied,
  *		the holding page is VM_PAGE_NULL.
  *
@@ -288,7 +288,7 @@ vm_pageout_setup(
  *		The "initial" argument specifies whether this
  *		data is an initialization only, and should use
  *		memory_object_data_initialize instead of
- *		memory_object_data_write.
+ *		memory_object_data_return.
  *
  *		The "flush" argument specifies whether the page
  *		should be flushed from the object.  If not, a
@@ -364,10 +364,9 @@ vm_pageout_page(
 	rc = vm_map_copyin_object(new_object, 0, PAGE_SIZE, &copy);
 	assert(rc == KERN_SUCCESS);
 
-	if (initial || old_object->use_old_pageout) {
-		rc = (*(initial ? memory_object_data_initialize
-			     : memory_object_data_write))
-			(old_object->pager,
+	if (initial) {
+		rc = memory_object_data_initialize(
+			 old_object->pager,
 			 old_object->pager_request,
 			 paging_offset, (pointer_t) copy, PAGE_SIZE);
 	}