diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2017-01-25 11:33:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2017-01-25 11:33:31 +0100 |
| commit | 1706f9302887cf238862fb7d92ca8d77fcef71d3 (patch) | |
| tree | 5c505a15e04766824c29d80d7bc87d2ca4e6d74a /erts/emulator/sys | |
| parent | c2a833811c768fc38b51a5241f55eb25786ac13e (diff) | |
| parent | 1623d7a85908221a118356bec64693901405659d (diff) | |
| download | otp-1706f9302887cf238862fb7d92ca8d77fcef71d3.tar.gz otp-1706f9302887cf238862fb7d92ca8d77fcef71d3.tar.bz2 otp-1706f9302887cf238862fb7d92ca8d77fcef71d3.zip | |
Merge branch 'egil/erts/fix-crashdump-suspend/OTP-14164' into maint
* egil/erts/fix-crashdump-suspend/OTP-14164:
erts: Fix thread suspend in crashdump
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c index 2fc802a2c6..e135dbff99 100644 --- a/erts/emulator/sys/unix/sys.c +++ b/erts/emulator/sys/unix/sys.c @@ -119,9 +119,8 @@ erts_smp_atomic_t sys_misc_mem_sz; static void smp_sig_notify(char c); static int sig_notify_fds[2] = {-1, -1}; -#if !defined(ETHR_UNUSABLE_SIGUSRX) && defined(ERTS_THR_HAVE_SIG_FUNCS) +#ifdef ERTS_SYS_SUSPEND_SIGNAL static int sig_suspend_fds[2] = {-1, -1}; -#define ERTS_SYS_SUSPEND_SIGNAL SIGUSR2 #endif #endif |