Merge branch 'rickard-sverker/supercarrier/OTP-11149' into maint

* rickard-sverker/supercarrier/OTP-11149: (29 commits)
  erts: Add test case for erts_mmap
  erts: Add mutex to init_atoms in erts_mmap.c
  erts: Fix lock violation for init_atoms in erl_mmap.c
  erts: Fix misc minor bugs in supercarrier initialization
  erts: Add erts_mmap stats
  erts: Add erts_bld_tupleX macros
  erts: Rename erts_bld_atom_uint_2tup_list to *_uword_*
  erts: Fix bug in lookup_free_seg
  erts: Fix race bug in erts_munmap
  erts: Add HARD_DBG_MSEG
  erts: Refactor rbt_insert in erl_mmap
  erts: erts_mmap improved free seg desc management
  erts: Add documentation for +MMsc* system flags
  erts: Allow page aligned erts_munmap()
  erts: Sort tree in super aligned sizes (SA_SZ_ADDR_ORDER)
  erts: Fix ASSERT bug and void* arithmetics
  erts: Add mmap argument to erts_debug:get_internal_state
  erts: Improve erts_mmap out of free descriptor management
  erts: Cleanup erl_mmap
  erts: Add __func__ to ERTS_ASSERT macro
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/erts/emulator/beam/erl_utils.h b/erts/emulator/beam/erl_utils.h
index 80d29d554a..292d135946 100644
--- a/erts/emulator/beam/erl_utils.h
+++ b/erts/emulator/beam/erl_utils.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2012. All Rights Reserved.
+ * Copyright Ericsson AB 2012-2013. 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
@@ -168,6 +168,10 @@ Eterm erts_bld_uint64(Uint **hpp, Uint *szp, Uint64 ui64);
 Eterm erts_bld_sint64(Uint **hpp, Uint *szp, Sint64 si64);
 Eterm erts_bld_cons(Uint **hpp, Uint *szp, Eterm car, Eterm cdr);
 Eterm erts_bld_tuple(Uint **hpp, Uint *szp, Uint arity, ...);
+#define erts_bld_tuple2(H,S,E1,E2) erts_bld_tuple(H,S,2,E1,E2)
+#define erts_bld_tuple3(H,S,E1,E2,E3) erts_bld_tuple(H,S,3,E1,E2,E3)
+#define erts_bld_tuple4(H,S,E1,E2,E3,E4) erts_bld_tuple(H,S,4,E1,E2,E3,E4)
+#define erts_bld_tuple5(H,S,E1,E2,E3,E4,E5) erts_bld_tuple(H,S,5,E1,E2,E3,E4,E5)
 Eterm erts_bld_tuplev(Uint **hpp, Uint *szp, Uint arity, Eterm terms[]);
 Eterm erts_bld_string_n(Uint **hpp, Uint *szp, const char *str, Sint len);
 #define erts_bld_string(hpp,szp,str) erts_bld_string_n(hpp,szp,str,strlen(str))
@@ -175,8 +179,8 @@ Eterm erts_bld_list(Uint **hpp, Uint *szp, Sint length, Eterm terms[]);
 Eterm erts_bld_2tup_list(Uint **hpp, Uint *szp,
 			 Sint length, Eterm terms1[], Uint terms2[]);
 Eterm
-erts_bld_atom_uint_2tup_list(Uint **hpp, Uint *szp,
-			     Sint length, Eterm atoms[], Uint uints[]);
+erts_bld_atom_uword_2tup_list(Uint **hpp, Uint *szp,
+			     Sint length, Eterm atoms[], UWord uints[]);
 Eterm
 erts_bld_atom_2uint_3tup_list(Uint **hpp, Uint *szp, Sint length,
 			      Eterm atoms[], Uint uints1[], Uint uints2[]);