aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-03-09 18:14:30 +0100
committerSverker Eriksson <[email protected]>2016-03-09 18:14:30 +0100
commit104cca3be8852070cb3c6d5b12ea74fe1591ba9b (patch)
treed7f911adfb640801bacd2e16333f6ba54ad3f221 /erts
parentaeccfd1c8441ac0caa0c86aac19747eb64bd267d (diff)
parenta062b686d387c15a631a0794ecf9db0d64ea14be (diff)
downloadotp-104cca3be8852070cb3c6d5b12ea74fe1591ba9b.tar.gz
otp-104cca3be8852070cb3c6d5b12ea74fe1591ba9b.tar.bz2
otp-104cca3be8852070cb3c6d5b12ea74fe1591ba9b.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/test/nif_SUITE.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/erts/emulator/test/nif_SUITE.erl b/erts/emulator/test/nif_SUITE.erl
index 7ce37b04b3..c6c617f97f 100644
--- a/erts/emulator/test/nif_SUITE.erl
+++ b/erts/emulator/test/nif_SUITE.erl
@@ -1711,7 +1711,9 @@ tmpmem() ->
false -> undefined;
MemInfo ->
MSBCS = lists:foldl(
- fun ({instance, _, L}, Acc) ->
+ fun ({instance, 0, _}, Acc) ->
+ Acc; % Ignore instance 0
+ ({instance, _, L}, Acc) ->
{value,{_,MBCS}} = lists:keysearch(mbcs, 1, L),
{value,{_,SBCS}} = lists:keysearch(sbcs, 1, L),
[MBCS,SBCS | Acc]