diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-07 17:22:31 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-10 13:45:05 +0100 |
| commit | f878de5006045c849415afffaffc909458b5f6de (patch) | |
| tree | 7fb35887cabc60987614b02b45eb2ae0517bda4a /libpager/data-return.c | |
| parent | 808073c49814b415b7ad6226a3e8c95bb1dbc277 (diff) | |
libpager: remove the `seqno' parameters
* libpager/Makefile (MIGSFLAGS): Drop `-DSEQNOS'.
* libpager/priv.h (struct pager): Drop fields `seqno' and `waitingforseqno'.
* libpager/chg-compl.c: Adopt accordingly.
* libpager/data-request.c: Likewise.
* libpager/data-return.c: Likewise.
* libpager/data-unlock.c: Likewise.
* libpager/demuxer.c: Likewise.
* libpager/lock-completed.c: Likewise.
* libpager/no-senders.c: Likewise.
* libpager/notify-stubs.c: Likewise.
* libpager/object-init.c: Likewise.
* libpager/object-terminate.c: Likewise.
* libpager/pager-create.c: Likewise.
* libpager/stubs.c: Likewise.
Diffstat (limited to 'libpager/data-return.c')
| -rw-r--r-- | libpager/data-return.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libpager/data-return.c b/libpager/data-return.c index f16f3238..01f3db2d 100644 --- a/libpager/data-return.c +++ b/libpager/data-return.c @@ -21,13 +21,12 @@ #include <string.h> #include <assert.h> -/* Worker function used by _pager_seqnos_memory_object_data_return - and _pager_seqnos_memory_object_data_initialize. All args are - as for _pager_seqnos_memory_object_data_return; the additional +/* Worker function used by _pager_S_memory_object_data_return + and _pager_S_memory_object_data_initialize. All args are + as for _pager_S_memory_object_data_return; the additional INITIALIZING arg identifies which function is calling us. */ kern_return_t _pager_do_write_request (struct pager *p, - mach_port_seqno_t seqno, mach_port_t control, vm_offset_t offset, pointer_t data, @@ -113,6 +112,7 @@ _pager_do_write_request (struct pager *p, than we really have to require (because *all* future writes on this object are going to wait for seqno while we wait for the previous write), but the case is relatively infrequent. */ + /* XXX: Is this still needed? */ retry: for (i = 0; i < npages; i++) if (pm_entries[i] & PM_PAGINGOUT) @@ -254,8 +254,7 @@ _pager_do_write_request (struct pager *p, /* Implement pageout call back as described by <mach/memory_object.defs>. */ kern_return_t -_pager_seqnos_memory_object_data_return (struct pager *p, - mach_port_seqno_t seqno, +_pager_S_memory_object_data_return (struct pager *p, mach_port_t control, vm_offset_t offset, pointer_t data, @@ -263,6 +262,6 @@ _pager_seqnos_memory_object_data_return (struct pager *p, int dirty, int kcopy) { - return _pager_do_write_request (p, seqno, control, offset, data, + return _pager_do_write_request (p, control, offset, data, length, dirty, kcopy, 0); } |