aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-04-10 20:45:47 +0200
committerSverker Eriksson <[email protected]>2014-04-10 20:45:47 +0200
commitbee0ea4125e8b47478b77904bee06f8f38bbab42 (patch)
treedbeaaa41c6d8a96a14bd4ab4a330f30d24fa69c0 /erts/emulator/beam
parentfc2b873cc6236841f73afdcdc5ac81105a9a3cd3 (diff)
parent9e19d1bf9fc7dc322823327e5e78f4ec0c3cee37 (diff)
downloadotp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.gz
otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.tar.bz2
otp-bee0ea4125e8b47478b77904bee06f8f38bbab42.zip
Merge branch 'maint-17' into maint
Conflicts: OTP_VERSION erts/vsn.mk
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index 305058ceff..ea5c850a30 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1999-2013. All Rights Reserved.
+ * Copyright Ericsson AB 1999-2014. All Rights Reserved.
*
* The contents of this file are subject to the Erlang Public License,
* Version 1.1, (the "License"); you may not use this file except in
@@ -2524,7 +2524,7 @@ monitor_large_heap(Process *p) {
#ifndef ERTS_SMP
ASSERT(is_internal_pid(system_monitor));
monitor_p = erts_proc_lookup(system_monitor);
- if (monitor_p || p == monitor_p) {
+ if (!monitor_p || p == monitor_p) {
return;
}
#endif