aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src/kernel.app.src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2017-02-03 15:22:06 +0100
committerBjörn-Egil Dahlberg <[email protected]>2017-02-03 15:22:06 +0100
commite53e74c5349061857d8eeb9c564768e54446012a (patch)
tree1c7ebcd38ff44e9ca0d8ba558e334791858b5096 /lib/kernel/src/kernel.app.src
parent08726ff1c6a0bfb9989034920184438aed9db8bd (diff)
parent1409b6ae110f60c410e83d1923dd59ae3659a887 (diff)
downloadotp-e53e74c5349061857d8eeb9c564768e54446012a.tar.gz
otp-e53e74c5349061857d8eeb9c564768e54446012a.tar.bz2
otp-e53e74c5349061857d8eeb9c564768e54446012a.zip
Merge branch 'egil/20/erts/signal-service/OTP-14186'
* egil/20/erts/signal-service/OTP-14186: kernel: Document signal server erts: Use os module instead of erts_internal for set_signal/2 erts: Do not handle SIGILL erts: Fix thread suspend in crashdump erts: Do not enable SIGINT erts: Use generic signal handler erts: Add OS signal tests erts: Handle SIGUSR1 via signal service instead erts: Handle SIGTERM via signal service instead kernel: Add gen_event signal server and default handler erts: Add SIGHUP signal handler erts: Remove whitespace errors Conflicts: erts/emulator/beam/bif.tab
Diffstat (limited to 'lib/kernel/src/kernel.app.src')
-rw-r--r--lib/kernel/src/kernel.app.src1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 4d08a55c7c..25e4ddd95c 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -34,6 +34,7 @@
erl_boot_server,
erl_distribution,
erl_reply,
+ erl_signal_handler,
error_handler,
error_logger,
file,