aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-10-11 12:30:36 +0200
committerSverker Eriksson <[email protected]>2010-11-25 11:17:14 +0100
commit0c80e76341da1d19461560e048b3df114da14b05 (patch)
treefac0e7488e1ffa3fffa88705c323c9556bad9075 /erts/emulator/beam
parent99a28d961d2d760e98353b55991f1fc51dee06b0 (diff)
downloadotp-0c80e76341da1d19461560e048b3df114da14b05.tar.gz
otp-0c80e76341da1d19461560e048b3df114da14b05.tar.bz2
otp-0c80e76341da1d19461560e048b3df114da14b05.zip
Teach erl_alloc.c not to disable internal allocators for halfword
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_alloc.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 07b4167b27..7793f60f4f 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -1348,6 +1348,13 @@ handle_args(int *argc, char **argv, erts_alc_hndl_args_init_t *init)
argv[j++] = argv[i];
}
*argc = j;
+#if HALFWORD_HEAP
+ /* If halfword heap, silently ignore any disabling of internal
+ allocators */
+ for (i = 0; i < aui_sz; ++i)
+ aui[i]->enable = 1;
+#endif
+
}