diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 16:02:02 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 16:02:02 +0100 |
| commit | 5cba72579ad75f85797aae14fde94fca6acf6406 (patch) | |
| tree | dcced80b5816741682d10f77d37e5a059c054e42 /erts/emulator/sys/common/erl_poll.c | |
| parent | c959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-5cba72579ad75f85797aae14fde94fca6acf6406.tar.gz otp-5cba72579ad75f85797aae14fde94fca6acf6406.tar.bz2 otp-5cba72579ad75f85797aae14fde94fca6acf6406.zip | |
Merge branch 'dev' into bmk/inets/httpc/support_upload_body_streaming/OTP-9094
Conflicts:
lib/inets/doc/src/notes.xml
Fixed release notes after merge.
Diffstat (limited to 'erts/emulator/sys/common/erl_poll.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_poll.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/sys/common/erl_poll.c b/erts/emulator/sys/common/erl_poll.c index 77ac2de5f6..3ae5b8d747 100644 --- a/erts/emulator/sys/common/erl_poll.c +++ b/erts/emulator/sys/common/erl_poll.c @@ -347,6 +347,7 @@ reset_wakeup_state(ErtsPollSet ps) { #ifdef ERTS_SMP erts_atomic32_set(&ps->wakeup_state, ERTS_POLL_NOT_WOKEN); + ERTS_THR_MEMORY_BARRIER; #elif ERTS_POLL_ASYNC_INTERRUPT_SUPPORT ps->wakeup_state = 0; #endif |