From c0eaf0fad88f15c843098a43ca2cadbf009ce094 Mon Sep 17 00:00:00 2001 From: Jonathan Neuschäfer Date: Mon, 15 Aug 2011 22:10:09 +0200 Subject: fix common misspellings * Fix spelling with codespell[1] and manually review it. [1] http://git.profusion.mobi/cgit.cgi/lucas/codespell/ --- hurd/console.h | 2 +- hurd/hurd_types.h | 2 +- hurd/io.defs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'hurd') diff --git a/hurd/console.h b/hurd/console.h index 4634cc28..baf03942 100644 --- a/hurd/console.h +++ b/hurd/console.h @@ -122,7 +122,7 @@ struct cons_display ever increased by the server, so clients can optimize scrolling. */ uint32_t scr_lines; /* Number of lines in scrollback buffer - preceeding CUR_LINE. */ + preceding CUR_LINE. */ uint32_t height; /* Number of lines in visible area following (and including) CUR_LINE. */ uint32_t matrix; /* Index (in uint32_t) of the beginning of diff --git a/hurd/hurd_types.h b/hurd/hurd_types.h index 86b9bcbe..e1a644f1 100644 --- a/hurd/hurd_types.h +++ b/hurd/hurd_types.h @@ -201,7 +201,7 @@ enum term_bottom_type remap - TY, FL, NR NR * (OFFS, LEN) - 1 (BS and SIZE are that of the child) copy - TY, FL, SIZE - DATA - - (DATA is preceeded by padding to the next page boundary, and is + (DATA is preceded by padding to the next page boundary, and is SIZE bytes long itself) For ileave, concat, and layer, the children are encoded following the parent. diff --git a/hurd/io.defs b/hurd/io.defs index d30233e6..9119b05b 100644 --- a/hurd/io.defs +++ b/hurd/io.defs @@ -101,7 +101,7 @@ routine io_clear_some_openmodes ( when appropriate, to the designated port using sig_post. A port is also returned which will be used as the reference port in sending such signals (this is the "async IO ID" port). The async - call is cancelled by deleting all refernces to the async_id_port. + call is cancelled by deleting all references to the async_id_port. Each call to io_async generates a new ASYNC_ID_PORT. */ routine io_async ( -- cgit v1.2.3 From 0162d565bf9b48d8ee33406f2f1d65c05c37fe88 Mon Sep 17 00:00:00 2001 From: Maksym Planeta Date: Sun, 20 Nov 2011 09:41:59 +0100 Subject: Fix defpager into using the correct control port The reply_port is only the correct control port when RPCs are from the kernel, not from e.g. tmpfs, such as default_pager_object_set_size calls. * mach-defpager/default_pager.c (seqnos_memory_object_terminate, S_default_pager_object_set_size): Make default pager use its own memory object control ports for external objects, remove reply_to parameter. * trans/proxy-defpager.c (S_default_pager_object_set_size): Remove reply_to parameter. * hurd/default_pager.defs (default_pager_object_set_size): Remove unused parameter. --- hurd/default_pager.defs | 1 - mach-defpager/default_pager.c | 9 ++++++--- trans/proxy-defpager.c | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'hurd') diff --git a/hurd/default_pager.defs b/hurd/default_pager.defs index 7b1549a0..8ad82dcc 100644 --- a/hurd/default_pager.defs +++ b/hurd/default_pager.defs @@ -91,6 +91,5 @@ routine default_pager_paging_storage( will fail. */ routine default_pager_object_set_size( memory_object : mach_port_t; - sreplyport reply_port : mach_port_send_once_t; msgseqno seqno : mach_port_seqno_t; object_size_limit : vm_size_t); diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c index 5944e4eb..82619b4b 100644 --- a/mach-defpager/default_pager.c +++ b/mach-defpager/default_pager.c @@ -2500,6 +2500,8 @@ ddprintf ("seqnos_memory_object_terminate <%p>: pager_port_lock: <%p>[s:%d,r:%d, pager_port_wait_for_refs(ds); + if (ds->external) + pager_request = ds->pager_request; ds->pager_request = MACH_PORT_NULL; request_refs = ds->request_refs; ds->request_refs = 0; @@ -2515,6 +2517,8 @@ ddprintf ("seqnos_memory_object_terminate <%p>: pager_port_unlock: <%p>[s:%d,r:% * Now we deallocate our various port rights. */ + kr = mach_port_get_refs(default_pager_self, pager_request, + MACH_PORT_RIGHT_SEND, &request_refs); kr = mach_port_mod_refs(default_pager_self, pager_request, MACH_PORT_RIGHT_SEND, -request_refs); if (kr != KERN_SUCCESS) @@ -3724,7 +3728,6 @@ S_default_pager_object_pages (mach_port_t pager, kern_return_t S_default_pager_object_set_size (mach_port_t pager, - mach_port_t reply_to, mach_port_seqno_t seqno, vm_size_t limit) { @@ -3736,7 +3739,7 @@ S_default_pager_object_set_size (mach_port_t pager, return KERN_INVALID_ARGUMENT; pager_port_lock(ds, seqno); - pager_port_check_request(ds, reply_to); + pager_port_check_request(ds, ds->pager_request); pager_port_wait_for_readers(ds); pager_port_wait_for_writers(ds); @@ -3760,7 +3763,7 @@ S_default_pager_object_set_size (mach_port_t pager, VM_PROT_ALL, ds->pager); if (kr != KERN_SUCCESS) panic ("memory_object_lock_request: %d", kr); - ds->lock_request = reply_to; + ds->lock_request = ds->pager_request; kr = MIG_NO_REPLY; } else diff --git a/trans/proxy-defpager.c b/trans/proxy-defpager.c index cda79592..0a5ab65e 100644 --- a/trans/proxy-defpager.c +++ b/trans/proxy-defpager.c @@ -107,7 +107,6 @@ S_default_pager_paging_storage (mach_port_t default_pager, kern_return_t S_default_pager_object_set_size (mach_port_t memory_object, - mach_port_t reply_port, mach_port_seqno_t seqno, vm_size_t object_size_limit) { -- cgit v1.2.3