[hurd] 03/09: Remove support for the deprecated external memory interface.

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit b262c53330183d3c4563ce5f172b17fb33369070
Author: Justus Winter <address@hidden>
Date:   Sun Oct 2 13:26:05 2016 +0200

    Remove support for the deprecated external memory interface.
    
    * libpager/stubs.c (_pager_S_memory_object_data_write): Drop stub.
    * mach-defpager/default_pager.c (seqnos_memory_object_data_write):
    Drop function.
---
 libpager/stubs.c              | 11 -----------
 mach-defpager/default_pager.c | 39 ++++++++++-----------------------------
 2 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/libpager/stubs.c b/libpager/stubs.c
index 964985b..e061783 100644
--- a/libpager/stubs.c
+++ b/libpager/stubs.c
@@ -32,17 +32,6 @@ _pager_S_memory_object_copy (struct pager *p,
 }
 
 kern_return_t __attribute__((weak))
-_pager_S_memory_object_data_write (struct pager *p,
-                                mach_port_t ctl,
-                                vm_offset_t off,
-                                pointer_t data,
-                                vm_size_t data_cnt)
-{
-  printf ("m_o_data_write called\n");
-  return EOPNOTSUPP;
-}
-
-kern_return_t __attribute__((weak))
 _pager_S_memory_object_supply_completed (struct pager *p,
                                       mach_port_t ctl,
                                       vm_offset_t off,
diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c
index d7bc75b..787ba5b 100644
--- a/mach-defpager/default_pager.c
+++ b/mach-defpager/default_pager.c
@@ -2623,27 +2623,31 @@ ddprintf ("seqnos_memory_object_data_initialize <%p>: 
pager_port_unlock: <%p>[s:
 }
 
 /*
- * memory_object_data_write: split up the stuff coming in from
+ * memory_object_data_return: split up the stuff coming in from
  * a memory_object_data_write call
  * into individual pages and pass them off to default_write.
  */
 kern_return_t
-seqnos_memory_object_data_write(ds, seqno, pager_request,
-                               offset, addr, data_cnt)
+seqnos_memory_object_data_return(ds, seqno, pager_request,
+                                offset, addr, data_cnt,
+                                dirty, kernel_copy)
        default_pager_t ds;
        mach_port_seqno_t seqno;
        mach_port_t     pager_request;
-       register
        vm_offset_t     offset;
-       register
        pointer_t       addr;
        vm_size_t       data_cnt;
+       boolean_t       dirty;
+       boolean_t       kernel_copy;
 {
        register
        vm_size_t       amount_sent;
-       static char     here[] = "%sdata_write";
+       static char     here[] = "%sdata_return";
        int err;
 
+       (void) dirty;
+       (void) kernel_copy;
+
 #ifdef lint
        pager_request++;
 #endif  /* lint */
@@ -2765,29 +2769,6 @@ seqnos_memory_object_supply_completed(ds, seqno, 
pager_request,
        return(KERN_FAILURE);
 }
 
-/*
- * memory_object_data_return: split up the stuff coming in from
- * a memory_object_data_write call
- * into individual pages and pass them off to default_write.
- */
-kern_return_t
-seqnos_memory_object_data_return(ds, seqno, pager_request,
-                                offset, addr, data_cnt,
-                                dirty, kernel_copy)
-       default_pager_t ds;
-       mach_port_seqno_t seqno;
-       mach_port_t     pager_request;
-       vm_offset_t     offset;
-       pointer_t       addr;
-       vm_size_t       data_cnt;
-       boolean_t       dirty;
-       boolean_t       kernel_copy;
-{
-
-       return seqnos_memory_object_data_write (ds, seqno, pager_request,
-                                               offset, addr, data_cnt);
-}
-
 kern_return_t
 seqnos_memory_object_change_completed(ds, seqno, may_cache, copy_strategy)
        default_pager_t ds;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git