Merge branch 'lukas/erts/forker'

* lukas/erts/forker: (28 commits)
  erts: Never abort in the forked child
  erts: Mend ASSERT makro for erl_child_setup
  erts: Allow enomem failures in port_SUITE
  erts: iter_port sleep longer on freebsd
  erts: Allow one dangling fd if there is a gethost port
  erts: Only use forker StackAck on freebsd
  erts: It is not possible to exit the forker driver
  erts: Add forker StartAck for port start flowcontrol
  erts: Fix large open_port arg segfault for win32
  erts: Fix memory leak at async open port
  kernel: Remove cmd server for unix os:cmd
  erts: Add testcase for huge port environment
  erts: Move os_pid to port hash to child setup
  erts: Handle all EINTR and EAGAIN cases in child setup
  erts: Make child_setup work with large environments
  erts: Fix forker driver ifdefs for win32
  erts: Fix uds socket handling for os x
  erts: Fix dereferencing of unaligned integer for sparc
  erts: Flatten too long io vectors in uds write
  erts: Add fd count test for spawn_driver
  ...

Conflicts:
	erts/emulator/beam/erl_node_tables.c
	erts/preloaded/src/erts_internal.erl

1 files changed, 3 insertions, 0 deletions

diff --git a/erts/emulator/beam/export.c b/erts/emulator/beam/export.c
index 2420df36b5..581efe6eec 100644
--- a/erts/emulator/beam/export.c
+++ b/erts/emulator/beam/export.c
@@ -184,6 +184,9 @@ init_export_table(void)
     f.cmp  = (HCMP_FUN) export_cmp;
     f.alloc = (HALLOC_FUN) export_alloc;
     f.free = (HFREE_FUN) export_free;
+    f.meta_alloc = (HMALLOC_FUN) erts_alloc;
+    f.meta_free = (HMFREE_FUN) erts_free;
+    f.meta_print = (HMPRINT_FUN) erts_print;
 
     for (i=0; i<ERTS_NUM_CODE_IX; i++) {
 	erts_index_init(ERTS_ALC_T_EXPORT_TABLE, &export_tables[i], "export_list",