aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-02-16 12:47:11 +0100
committerHenrik Nord <[email protected]>2012-02-16 12:47:11 +0100
commit5620b434415d7c7d7060dbeff2c71d6bb96b91da (patch)
tree28d681356120a3a5fc8c4fba7c2e9b2acfd64718 /erts/emulator
parentddfe258f12a7706f3aea4f20bf6fc46b839ab70c (diff)
parentc826b7309e57e33b1209d5b6c0f15a0e26122729 (diff)
downloadotp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.gz
otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.tar.bz2
otp-5620b434415d7c7d7060dbeff2c71d6bb96b91da.zip
Merge branch 'maint'
Conflicts: lib/hipe/cerl/erl_bif_types.erl lib/stdlib/doc/src/binary.xml
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_process.c1
-rw-r--r--erts/emulator/beam/register.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 30c91af630..eedbb35486 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -228,7 +228,6 @@ static Uint last_reductions;
static Uint last_exact_reductions;
Uint erts_default_process_flags;
Eterm erts_system_monitor;
-Eterm erts_system_monitor_msg_queue_len;
Eterm erts_system_monitor_long_gc;
Eterm erts_system_monitor_large_heap;
struct erts_system_monitor_flags_t erts_system_monitor_flags;
diff --git a/erts/emulator/beam/register.h b/erts/emulator/beam/register.h
index 97bab3ab71..bf15e63554 100644
--- a/erts/emulator/beam/register.h
+++ b/erts/emulator/beam/register.h
@@ -41,7 +41,7 @@ struct port;
typedef struct reg_proc
{
HashBucket bucket; /* MUST BE LOCATED AT TOP OF STRUCT!!! */
- Process *p; /* The process registerd (only one of this and
+ Process *p; /* The process registered (only one of this and
'pt' is non-NULL */
struct port *pt; /* The port registered */
Eterm name; /* Atom name */