aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:05:49 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-02-03 12:05:49 +0100
commitea530357b27635278ae8a3260e735ea39df5c283 (patch)
treebe851c5f9fa4cc4f74f3b2c82895f43542471adb /erts
parentb2f2d1059fda823d3f71086a77adeb99d5475b94 (diff)
downloadotp-ea530357b27635278ae8a3260e735ea39df5c283.tar.gz
otp-ea530357b27635278ae8a3260e735ea39df5c283.tar.bz2
otp-ea530357b27635278ae8a3260e735ea39df5c283.zip
Fix merge commit
This fixes commit f0867aa2ccbbf5677e0577bba08f8b7bc53ec0ed
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_init.c1
-rw-r--r--erts/emulator/sys/unix/sys.c46
2 files changed, 0 insertions, 47 deletions
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 2fd97208cc..070cc3f2d0 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -2220,7 +2220,6 @@ erl_start(int argc, char **argv)
init_break_handler();
if (replace_intr)
erts_replace_intr();
- sys_init_suspend_handler();
#endif
boot_argc = argc - i; /* Number of arguments to init */
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index fa95473db8..e135dbff99 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -819,61 +819,15 @@ void init_break_handler(void)
}
void sys_init_suspend_handler(void)
-<<<<<<< HEAD
{
#ifdef ERTS_SYS_SUSPEND_SIGNAL
sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
-=======
-{
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
- sys_signal(ERTS_SYS_SUSPEND_SIGNAL, suspend_signal);
-#endif
-}
-
-int sys_max_files(void)
-{
- return(max_files);
-}
-
-static void block_signals(void)
-{
-#if !CHLDWTHR
- sys_sigblock(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
- sys_sigblock(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
- sys_sigblock(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
- sys_sigblock(ERTS_SYS_SUSPEND_SIGNAL);
->>>>>>> maint-18
#endif
}
int sys_max_files(void)
{
-<<<<<<< HEAD
return(max_files);
-=======
- /* Update erl_child_setup.c if changed */
-#if !CHLDWTHR
- sys_sigrelease(SIGCHLD);
-#endif
-#ifndef ERTS_SMP
- sys_sigrelease(SIGINT);
-#ifndef ETHR_UNUSABLE_SIGUSRX
- sys_sigrelease(SIGUSR1);
-#endif /* #ifndef ETHR_UNUSABLE_SIGUSRX */
-#endif /* #ifndef ERTS_SMP */
-
-#ifdef ERTS_SYS_SUSPEND_SIGNAL
- sys_sigrelease(ERTS_SYS_SUSPEND_SIGNAL);
-#endif
-
->>>>>>> maint-18
}
/************************** OS info *******************************/