[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnumach] 01/02: Imported Upstream version 1.4+git20150208
|
From: |
Samuel Thibault |
|
Subject: |
[gnumach] 01/02: Imported Upstream version 1.4+git20150208 |
|
Date: |
Sun, 08 Feb 2015 20:25:54 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch master
in repository gnumach.
commit f673ab19ae2995e1e329e1fee92c21050aa79efe
Author: Samuel Thibault <address@hidden>
Date: Sun Feb 8 20:13:51 2015 +0000
Imported Upstream version 1.4+git20150208
---
ChangeLog | 25 +++++++++++++++++++++++++
Makefile.am | 4 ++--
Makefile.in | 4 ++--
configure | 20 ++++++++++----------
ddb/db_sym.c | 2 +-
ddb/db_task_thread.c | 2 +-
device/dev_name.c | 2 +-
device/net_io.c | 2 +-
device/tty.h | 2 +-
doc/mach.info | 2 +-
doc/mach.info-1 | 4 ++--
doc/mach.info-2 | 2 +-
doc/stamp-vti | 4 ++--
doc/version.texi | 4 ++--
i386/i386/io_perm.c | 2 +-
i386/i386/pcb.c | 2 +-
i386/i386/trap.c | 2 +-
i386/i386at/com.c | 2 +-
i386/i386at/kd.c | 6 +++---
i386/include/mach/i386/vm_param.h | 2 +-
include/mach/profil.h | 2 +-
include/mach/vm_param.h | 2 +-
ipc/mach_port.c | 21 ++++++++++++++++-----
ipc/port.h | 2 +-
kern/ipc_kobject.c | 2 +-
kern/ipc_mig.c | 2 +-
kern/mach_clock.c | 2 +-
kern/profile.c | 2 +-
kern/sched_prim.c | 2 +-
kern/strings.c | 4 ++--
kern/xpr.h | 2 +-
version.m4 | 2 +-
vm/vm_object.c | 2 +-
33 files changed, 89 insertions(+), 53 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0da99b7..914856a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2015-01-22 Justus Winter <address@hidden>
+
+ ipc: warn about more port management bugs
+ * ipc/mach_port.c (mach_port_destroy): Simplify expression. Reword
warning.
+ (mach_port_deallocate): Likewise.
+ (mach_port_mod_refs): Also warn about errors when using this function.
+
+2015-01-02 Stefan Weil <address@hidden>
+
+ vm: Fix typo in comment (found by codespell)
+
+ kern: Fix typos in comments (found by codespell)
+
+ ipc: Fix typo in comment (found by codespell)
+
+ include: Fix typos in comments (found by codespell)
+
+ i386: Fix typos in comments (found by codespell)
+
+ device: Fix typos in comments (found by codespell)
+
+ Makefile.am: Fix typos and grammar in comment
+
+ ddb: Fix typos in comments (found by codespell)
+
2015-01-02 Samuel Thibault <address@hidden>
Handle kernel traps happening before starting userland
diff --git a/Makefile.am b/Makefile.am
index cb8c096..1afddab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,8 +104,8 @@ CPP = @CPP@ -x c
# Other Tools' Configuration.
#
-# Don't needlessly overwrite files that whose contents haven't changed. This
-# helps for avoinding unneccessary recompilation cycles when keeping
+# Don't needlessly overwrite files whose contents haven't changed.
+# This helps avoiding unnecessary recompilation cycles when keeping
# cross-compilation toolchains up-to-date. Thus, unconditionally use the
# `install-sh' that is supplied by GNU Automake 1.10.1, as the GNU Coreutils
# one doesn't provide this functionality yet (TODO: change that). TODO:
diff --git a/Makefile.in b/Makefile.in
index db851e2..9135419 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2395,8 +2395,8 @@ infodir = @infodir@
# Other Tools' Configuration.
#
-# Don't needlessly overwrite files that whose contents haven't changed. This
-# helps for avoinding unneccessary recompilation cycles when keeping
+# Don't needlessly overwrite files whose contents haven't changed.
+# This helps avoiding unnecessary recompilation cycles when keeping
# cross-compilation toolchains up-to-date. Thus, unconditionally use the
# `install-sh' that is supplied by GNU Automake 1.10.1, as the GNU Coreutils
# one doesn't provide this functionality yet (TODO: change that). TODO:
diff --git a/configure b/configure
index f38cd80..b2c701a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU Mach 1.4+git20150102.
+# Generated by GNU Autoconf 2.69 for GNU Mach 1.4+git20150208.
#
# Report bugs to <address@hidden>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Mach'
PACKAGE_TARNAME='gnumach'
-PACKAGE_VERSION='1.4+git20150102'
-PACKAGE_STRING='GNU Mach 1.4+git20150102'
+PACKAGE_VERSION='1.4+git20150208'
+PACKAGE_STRING='GNU Mach 1.4+git20150208'
PACKAGE_BUGREPORT='address@hidden'
PACKAGE_URL=''
@@ -1584,7 +1584,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Mach 1.4+git20150102 to adapt to many kinds of
systems.
+\`configure' configures GNU Mach 1.4+git20150208 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1654,7 +1654,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Mach 1.4+git20150102:";;
+ short | recursive ) echo "Configuration of GNU Mach 1.4+git20150208:";;
esac
cat <<\_ACEOF
@@ -2002,7 +2002,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Mach configure 1.4+git20150102
+GNU Mach configure 1.4+git20150208
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2094,7 +2094,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Mach $as_me 1.4+git20150102, which was
+It was created by GNU Mach $as_me 1.4+git20150208, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2960,7 +2960,7 @@ fi
# Define the identity of the package.
PACKAGE='gnumach'
- VERSION='1.4+git20150102'
+ VERSION='1.4+git20150208'
# Some tools Automake needs.
@@ -12110,7 +12110,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Mach $as_me 1.4+git20150102, which was
+This file was extended by GNU Mach $as_me 1.4+git20150208, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12181,7 +12181,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU Mach config.status 1.4+git20150102
+GNU Mach config.status 1.4+git20150208
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/ddb/db_sym.c b/ddb/db_sym.c
index 0179137..2abd574 100644
--- a/ddb/db_sym.c
+++ b/ddb/db_sym.c
@@ -293,7 +293,7 @@ db_name_is_ambiguous(char *sym_name)
* and the difference between val and the symbol found.
*
* Logic change. If the task argument is non NULL and a
- * matching symbol is found in a symbol table which explictly
+ * matching symbol is found in a symbol table which explicitly
* specifies its map to be task->map, that symbol will have
* precedence over any symbol from a symbol table will a null
* map. This allows overlapping kernel/user maps to work correctly.
diff --git a/ddb/db_task_thread.c b/ddb/db_task_thread.c
index edab17e..7927e67 100644
--- a/ddb/db_task_thread.c
+++ b/ddb/db_task_thread.c
@@ -150,7 +150,7 @@ db_check_thread_address_valid(thread)
}
/*
- * convert task_id(queue postion) to task address
+ * convert task_id(queue position) to task address
*/
task_t
db_lookup_task_id(int task_id)
diff --git a/device/dev_name.c b/device/dev_name.c
index 5bf62a0..175e389 100644
--- a/device/dev_name.c
+++ b/device/dev_name.c
@@ -207,7 +207,7 @@ boolean_t dev_name_lookup(
}
*unit += (slice_num << 4);
- /* if slice==0, it is either compatability or whole device */
+ /* if slice==0, it is either compatibility or whole device */
if (c >= 'a' && c < 'a' + j) { /* note: w/o this -> whole slice */
/*
diff --git a/device/net_io.c b/device/net_io.c
index a9d318e..d2928cc 100644
--- a/device/net_io.c
+++ b/device/net_io.c
@@ -640,7 +640,7 @@ net_packet(
* Do a quick check to see if it is a kernel TTD packet.
*
* Only check if KernelTTD is enabled, ie. the current
- * device driver supports TTD, and the bootp succeded.
+ * device driver supports TTD, and the bootp succeeded.
*/
if (kttd_enabled && kttd_handle_async(kmsg)) {
/*
diff --git a/device/tty.h b/device/tty.h
index a931e33..d7aa2ad 100644
--- a/device/tty.h
+++ b/device/tty.h
@@ -184,7 +184,7 @@ extern boolean_t tty_portdeath(
#define TS_TRANSLATE 0x00100000 /* translation device enabled */
#define TS_KDB 0x00200000 /* should enter kdb on ALT */
-#define TS_MIN_TO_RCV 0x00400000 /* character recived during
+#define TS_MIN_TO_RCV 0x00400000 /* character received during
receive timeout interval */
/* flags - old names defined in terms of new ones */
diff --git a/doc/mach.info b/doc/mach.info
index e98437c..9a6edb8 100644
--- a/doc/mach.info
+++ b/doc/mach.info
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 5.2 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 10 November 2014, of 'The GNU
-Mach Reference Manual', for version 1.4+git20150102.
+Mach Reference Manual', for version 1.4+git20150208.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/mach.info-1 b/doc/mach.info-1
index ad7d2bb..1fcdb3c 100644
--- a/doc/mach.info-1
+++ b/doc/mach.info-1
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 5.2 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 10 November 2014, of 'The GNU
-Mach Reference Manual', for version 1.4+git20150102.
+Mach Reference Manual', for version 1.4+git20150208.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
@@ -46,7 +46,7 @@ Main Menu
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 10 November 2014, of 'The GNU
-Mach Reference Manual', for version 1.4+git20150102.
+Mach Reference Manual', for version 1.4+git20150208.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/mach.info-2 b/doc/mach.info-2
index 2a9532a..988b3d1 100644
--- a/doc/mach.info-2
+++ b/doc/mach.info-2
@@ -3,7 +3,7 @@ This is mach.info, produced by makeinfo version 5.2 from
mach.texi.
This file documents the GNU Mach microkernel.
This is edition 0.4, last updated on 10 November 2014, of 'The GNU
-Mach Reference Manual', for version 1.4+git20150102.
+Mach Reference Manual', for version 1.4+git20150208.
Copyright (C) 2001, 2002, 2006, 2007, 2008 Free Software Foundation,
Inc.
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 1c40ccd..242caf0 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
@set UPDATED 10 November 2014
@set UPDATED-MONTH November 2014
address@hidden EDITION 1.4+git20150102
address@hidden VERSION 1.4+git20150102
address@hidden EDITION 1.4+git20150208
address@hidden VERSION 1.4+git20150208
diff --git a/doc/version.texi b/doc/version.texi
index 1c40ccd..242caf0 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 10 November 2014
@set UPDATED-MONTH November 2014
address@hidden EDITION 1.4+git20150102
address@hidden VERSION 1.4+git20150102
address@hidden EDITION 1.4+git20150208
address@hidden VERSION 1.4+git20150208
diff --git a/i386/i386/io_perm.c b/i386/i386/io_perm.c
index 6a6e660..d5c7103 100644
--- a/i386/i386/io_perm.c
+++ b/i386/i386/io_perm.c
@@ -221,7 +221,7 @@ i386_io_perm_create (const ipc_port_t master_port,
io_port_t from, io_port_t to,
}
/* Modify the I/O permissions for TARGET_TASK. If ENABLE is TRUE, the
- permission to acces the I/O ports specified by IO_PERM is granted,
+ permission to access the I/O ports specified by IO_PERM is granted,
otherwise it is withdrawn.
The function returns KERN_INVALID_ARGUMENT if TARGET_TASK is not a valid
diff --git a/i386/i386/pcb.c b/i386/i386/pcb.c
index 5866cac..e8040c8 100644
--- a/i386/i386/pcb.c
+++ b/i386/i386/pcb.c
@@ -801,7 +801,7 @@ thread_set_syscall_return(
}
/*
- * Return prefered address of user stack.
+ * Return preferred address of user stack.
* Always returns low address. If stack grows up,
* the stack grows away from this address;
* if stack grows down, the stack grows towards this
diff --git a/i386/i386/trap.c b/i386/i386/trap.c
index f1fe634..6470504 100644
--- a/i386/i386/trap.c
+++ b/i386/i386/trap.c
@@ -574,7 +574,7 @@ i386_astintr(void)
if (need_ast[mycpu] & AST_I386_FP) {
/*
* AST was for delayed floating-point exception -
- * FP interrupt occured while in kernel.
+ * FP interrupt occurred while in kernel.
* Turn off this AST reason and handle the FPU error.
*/
ast_off(mycpu, AST_I386_FP);
diff --git a/i386/i386at/com.c b/i386/i386at/com.c
index c36cb6a..84891bd 100644
--- a/i386/i386at/com.c
+++ b/i386/i386at/com.c
@@ -145,7 +145,7 @@ comprobe_general(struct bus_device *dev, int noisy)
type = "82450 or 16450";
outb(FIFO_CTL(addr), iFIFOENA | iFIFO14CH); /* Enable fifo */
if ((inb(FIFO_CTL(addr)) & iFIFO14CH) != 0)
- { /* Was it successfull */
+ { /* Was it successful */
/* if both bits are not set then broken xx550 */
if ((inb(FIFO_CTL(addr)) & iFIFO14CH) == iFIFO14CH)
{
diff --git a/i386/i386at/kd.c b/i386/i386at/kd.c
index 7339767..bbb0023 100644
--- a/i386/i386at/kd.c
+++ b/i386/i386at/kd.c
@@ -204,7 +204,7 @@ u_char *esc_spt = (u_char *)0;
- Delete returns `ESC [ 9' instead of 0x7f.
- Alt + function keys return key sequences that are different
from the key sequences returned by the function keys alone.
- This is done with the idea of alowing a terminal server to
+ This is done with the idea of allowing a terminal server to
implement multiple virtual consoles mapped on Alt+F1, Alt+F2,
etc, as in Linux.
@@ -1880,7 +1880,7 @@ kd_cr(void)
* of the screen.
*
* input : None
- * output : Screen is cleared from current cursor postion to bottom
+ * output : Screen is cleared from current cursor position to bottom
*
*/
void
@@ -1903,7 +1903,7 @@ kd_cltobcur(void)
* of the screen.
*
* input : None
- * output : Screen is cleared from current cursor postion to top
+ * output : Screen is cleared from current cursor position to top
*
*/
void
diff --git a/i386/include/mach/i386/vm_param.h
b/i386/include/mach/i386/vm_param.h
index 8f708f0..3a209b8 100644
--- a/i386/include/mach/i386/vm_param.h
+++ b/i386/include/mach/i386/vm_param.h
@@ -29,7 +29,7 @@
* Date: 1985
*
* I386 machine dependent virtual memory parameters.
- * Most of the declarations are preceeded by I386_ (or i386_)
+ * Most of the declarations are preceded by I386_ (or i386_)
* which is OK because only I386 specific code will be using
* them.
*/
diff --git a/include/mach/profil.h b/include/mach/profil.h
index 0eb4ce4..866f267 100644
--- a/include/mach/profil.h
+++ b/include/mach/profil.h
@@ -137,7 +137,7 @@ extern vm_map_t kernel_map;
/* MACRO set_pbuf_value
**
** enters the value 'val' in the buffer 'pbuf' and returns the following
-** indications: 0: means that a fatal error occured: the buffer was full
+** indications: 0: means that a fatal error occurred: the buffer was full
** (it hasn't been sent yet)
** 1: means that a value has been inserted successfully
** 2: means that we'v just entered the last value causing
diff --git a/include/mach/vm_param.h b/include/mach/vm_param.h
index 0360981..cdccce8 100644
--- a/include/mach/vm_param.h
+++ b/include/mach/vm_param.h
@@ -39,7 +39,7 @@
#include <mach/machine/vm_types.h>
/*
- * The machine independent pages are refered to as PAGES. A page
+ * The machine independent pages are referred to as PAGES. A page
* is some number of hardware pages, depending on the target machine.
*
* All references to the size of a page should be done
diff --git a/ipc/mach_port.c b/ipc/mach_port.c
index c7d9b81..4e89527 100644
--- a/ipc/mach_port.c
+++ b/ipc/mach_port.c
@@ -570,8 +570,8 @@ mach_port_destroy(
kr = ipc_right_lookup_write(space, name, &entry);
if (kr != KERN_SUCCESS) {
- if (name != MACH_PORT_NULL && name != MACH_PORT_DEAD && space
== current_space()) {
- printf("task %.*s destroying an invalid port %lu, most
probably a bug.\n", sizeof current_task()->name, current_task()->name, name);
+ if (MACH_PORT_VALID (name) && space == current_space()) {
+ printf("task %.*s destroying a bogus port %lu, most
probably a bug.\n", sizeof current_task()->name, current_task()->name, name);
if (mach_port_deallocate_debug)
SoftDebugger("mach_port_deallocate");
}
@@ -614,8 +614,8 @@ mach_port_deallocate(
kr = ipc_right_lookup_write(space, name, &entry);
if (kr != KERN_SUCCESS) {
- if (name != MACH_PORT_NULL && name != MACH_PORT_DEAD && space
== current_space()) {
- printf("task %.*s deallocating an invalid port %lu,
most probably a bug.\n", sizeof current_task()->name, current_task()->name,
name);
+ if (MACH_PORT_VALID (name) && space == current_space()) {
+ printf("task %.*s deallocating a bogus port %lu, most
probably a bug.\n", sizeof current_task()->name, current_task()->name, name);
if (mach_port_deallocate_debug)
SoftDebugger("mach_port_deallocate");
}
@@ -735,8 +735,19 @@ mach_port_mod_refs(
return KERN_INVALID_VALUE;
kr = ipc_right_lookup_write(space, name, &entry);
- if (kr != KERN_SUCCESS)
+ if (kr != KERN_SUCCESS) {
+ if (MACH_PORT_VALID (name) && space == current_space()) {
+ printf("task %.*s %screasing a bogus port "
+ "%lu by %d, most probably a bug.\n",
+ sizeof current_task()->name,
+ current_task()->name,
+ delta < 0 ? "de" : "in", name,
+ delta < 0 ? -delta : delta);
+ if (mach_port_deallocate_debug)
+ SoftDebugger("mach_port_mod_refs");
+ }
return kr;
+ }
/* space is write-locked and active */
kr = ipc_right_delta(space, name, entry, right, delta); /* unlocks */
diff --git a/ipc/port.h b/ipc/port.h
index d6fb59b..d359115 100644
--- a/ipc/port.h
+++ b/ipc/port.h
@@ -45,7 +45,7 @@
* mach_port_t must be an unsigned type. Port values
* have two parts, a generation number and an index.
* These macros encapsulate all knowledge of how
- * a mach_port_t is layed out. However, ipc/ipc_entry.c
+ * a mach_port_t is laid out. However, ipc/ipc_entry.c
* implicitly assumes when it uses the splay tree functions
* that the generation number is in the low bits, so that
* names are ordered first by index and then by generation.
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index bf22028..709ec9e 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -244,7 +244,7 @@ ipc_kobject_server(request)
} else {
/*
* The message contents of the request are intact.
- * Destroy everthing except the reply port right,
+ * Destroy everything except the reply port right,
* which is needed in the reply message.
*/
diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index 41ebc94..cc61ec7 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -612,7 +612,7 @@ kern_return_t thread_set_state_KERNEL(
* knows to fall back on an RPC. For other return values, it won't
* retry with an RPC. The retry might get a different (incorrect) rc.
* Return values are only set (and should only be set, with copyout)
- * on successfull calls.
+ * on successful calls.
*/
kern_return_t
diff --git a/kern/mach_clock.c b/kern/mach_clock.c
index 0a7458b..b627b89 100644
--- a/kern/mach_clock.c
+++ b/kern/mach_clock.c
@@ -234,7 +234,7 @@ void clock_interrupt(
update_mapped_time(&time);
/*
- * Schedule soft-interupt for timeout if needed
+ * Schedule soft-interrupt for timeout if needed
*/
if (needsoft) {
if (basepri) {
diff --git a/kern/profile.c b/kern/profile.c
index e14d411..5510721 100644
--- a/kern/profile.c
+++ b/kern/profile.c
@@ -194,7 +194,7 @@ thread_t th;
* Make a request to the profile_thread by inserting
* the buffer in the send queue, and wake it up.
* The last buffer must be inserted at the head of the
- * send queue, so the profile_thread handles it immediatly.
+ * send queue, so the profile_thread handles it immediately.
*/
if (kmem_alloc( kernel_map, &vm_buf_entry,
sizeof(struct buf_to_send)) != KERN_SUCCESS)
diff --git a/kern/sched_prim.c b/kern/sched_prim.c
index 89fb1dc..376217a 100644
--- a/kern/sched_prim.c
+++ b/kern/sched_prim.c
@@ -155,7 +155,7 @@ void sched_init(void)
min_quantum = hz / 10; /* context switch 10 times/second */
wait_queue_init();
- pset_sys_bootstrap(); /* initialize processer mgmt. */
+ pset_sys_bootstrap(); /* initialize processor mgmt. */
queue_init(&action_queue);
simple_lock_init(&action_lock);
sched_tick = 0;
diff --git a/kern/strings.c b/kern/strings.c
index c77ae4f..e299534 100644
--- a/kern/strings.c
+++ b/kern/strings.c
@@ -50,7 +50,7 @@
* the contents are identical up to the length of s2.
* It returns < 0 if the first differing character is smaller
* in s1 than in s2 or if s1 is shorter than s2 and the
- * contents are identical upto the length of s1.
+ * contents are identical up to the length of s1.
*/
int __attribute__ ((pure))
@@ -157,7 +157,7 @@ strncpy(
/*
* Abstract:
- * strlen returns the number of characters in "string" preceeding
+ * strlen returns the number of characters in "string" preceding
* the terminating null character.
*/
diff --git a/kern/xpr.h b/kern/xpr.h
index 4a06216..72f6817 100644
--- a/kern/xpr.h
+++ b/kern/xpr.h
@@ -34,7 +34,7 @@
* which will expand into the following code:
* if (xprflags & XPR_SYSCALLS)
* xpr("syscall: %d, 0x%x\n", syscallno, arg1);
- * Xpr will log the pointer to the printf string and up to 6 arguements,
+ * Xpr will log the pointer to the printf string and up to 6 arguments,
* along with a timestamp and cpuinfo (for multi-processor systems), into
* a circular buffer. The actual printf processing is delayed until after
* the buffer has been collected. It is assumed that the text/data segments
diff --git a/version.m4 b/version.m4
index fb3dcf1..e48e906 100644
--- a/version.m4
+++ b/version.m4
@@ -1,4 +1,4 @@
m4_define([AC_PACKAGE_NAME],[GNU Mach])
-m4_define([AC_PACKAGE_VERSION],[1.4+git20150102])
+m4_define([AC_PACKAGE_VERSION],[1.4+git20150208])
m4_define([AC_PACKAGE_BUGREPORT],address@hidden)
m4_define([AC_PACKAGE_TARNAME],[gnumach])
diff --git a/vm/vm_object.c b/vm/vm_object.c
index 582487e..71c0edb 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -1466,7 +1466,7 @@ vm_object_t vm_object_copy_delayed(
* synchronization required in the "push"
* operation described above.
*
- * The copy-on-write is said to be assymetric because
+ * The copy-on-write is said to be asymmetric because
* the original object is *not* marked copy-on-write.
* A copied page is pushed to the copy object, regardless
* which party attempted to modify the page.
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/gnumach.git