diff options
| author | Erlang/OTP <[email protected]> | 2014-04-10 04:46:07 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-04-10 04:46:07 +0200 |
| commit | 3ca49505036d2300cc5119ff076475c37a9d92ee (patch) | |
| tree | 5132327f8832771332cb3db87df07cf31b5481fa | |
| parent | 07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff) | |
| parent | fa7f3e7ec457f1143ed4a3db1aa9d7aed8005a57 (diff) | |
| download | otp-3ca49505036d2300cc5119ff076475c37a9d92ee.tar.gz otp-3ca49505036d2300cc5119ff076475c37a9d92ee.tar.bz2 otp-3ca49505036d2300cc5119ff076475c37a9d92ee.zip | |
Merge branch 'sverk/monitor-large-heap-nosmp/OTP-11852' into maint-17
* sverk/monitor-large-heap-nosmp/OTP-11852:
erts: Fix system_monitor(large_heap) for non-smp VM
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 4 |
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 |