Merge branch 'master' into sverker/enif_select

Conflicts:
	erts/emulator/beam/erl_binary.h
	erts/emulator/beam/erl_monitors.c
	erts/emulator/beam/erl_nif.c
	erts/emulator/beam/global.h
	erts/emulator/test/nif_SUITE_data/nif_SUITE.c

3 files changed, 6 insertions, 6 deletions

diff --git a/erts/emulator/sys/common/erl_check_io.c b/erts/emulator/sys/common/erl_check_io.c
index 352e51a877..2214a1937a 100644
--- a/erts/emulator/sys/common/erl_check_io.c
+++ b/erts/emulator/sys/common/erl_check_io.c
@@ -38,6 +38,7 @@
 #include "erl_port.h"
 #include "erl_check_io.h"
 #include "erl_thr_progress.h"
+#include "erl_bif_unique.h"
 #include "dtrace-wrapper.h"
 #include "lttng-wrapper.h"
 #define ERTS_WANT_TIMER_WHEEL_API
@@ -2065,15 +2066,15 @@ send_event_tuple(struct erts_nif_select_event* e, ErtsResource* resource,
 
      /* {select, Resource, Ref, EventAtom} */
     if (is_value(e->immed)) {
-        hsz = 5 + PROC_BIN_SIZE;
+        hsz = 5 + ERTS_MAGIC_REF_THING_SIZE;
     }
     else {
-        hsz = 5 + PROC_BIN_SIZE + REF_THING_SIZE;
+        hsz = 5 + ERTS_MAGIC_REF_THING_SIZE + ERTS_REF_THING_SIZE;
     }
 
     mp = erts_alloc_message_heap(rp, &rp_locks, hsz, &hp, &ohp);
 
-    resource_term = erts_mk_magic_binary_term(&hp, ohp, &bin->binary);
+    resource_term = erts_mk_magic_ref(&hp, ohp, &bin->binary);
     if (is_value(e->immed)) {
         ASSERT(is_immed(e->immed));
         ref_term = e->immed;
@@ -2081,7 +2082,7 @@ send_event_tuple(struct erts_nif_select_event* e, ErtsResource* resource,
     else {
         write_ref_thing(hp, e->refn[0], e->refn[1], e->refn[2]);
         ref_term = make_internal_ref(hp);
-        hp += REF_THING_SIZE;
+        hp += ERTS_REF_THING_SIZE;
     }
     tuple = TUPLE4(hp, am_select, resource_term, ref_term, event_atom);
 
diff --git a/erts/emulator/sys/common/erl_mseg.c b/erts/emulator/sys/common/erl_mseg.c
index 4dd986f4c8..1e05fd3490 100644
--- a/erts/emulator/sys/common/erl_mseg.c
+++ b/erts/emulator/sys/common/erl_mseg.c
@@ -378,7 +378,7 @@ static ERTS_INLINE int cache_bless_segment(ErtsMsegAllctr_t *ma, void *seg, UWor
 
     ASSERT(!MSEG_FLG_IS_2POW(flags) || (MSEG_FLG_IS_2POW(flags) && MAP_IS_ALIGNED(seg) && IS_2POW(size)));
 
-    /* The idea is that sbc caching is prefered over mbc caching.
+    /* The idea is that sbc caching is preferred over mbc caching.
      * Blocks are normally allocated in mb carriers and thus cached there.
      * Large blocks has no such cache and it is up to mseg to cache them to speed things up.
      */
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c
index 0c4df3e13a..3cb0eb31f5 100644
--- a/erts/emulator/sys/common/erl_poll.c
+++ b/erts/emulator/sys/common/erl_poll.c
@@ -51,7 +51,6 @@
 #ifndef WANT_NONBLOCKING
 #  define WANT_NONBLOCKING
 #endif
-#define ERTS_WANT_GOT_SIGUSR1
 
 #include "erl_poll.h"
 #if ERTS_POLL_USE_KQUEUE