Merge branch 'lukas/erts/otp-21-misc'

* lukas/erts/otp-21-misc:
  erts: Fix unused variable warning in unix prim file
  erts: Fix erts_os_times warning
  kernel: Fix comment in kernel_config
  kernel: Refactor erl_signal_handler startup
  kernel: Remove doc for unused browser_cmd variable

1 files changed, 1 insertions, 7 deletions

diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl
index 20aa47f602..ae982c1741 100644
--- a/lib/kernel/src/kernel.erl
+++ b/lib/kernel/src/kernel.erl
@@ -32,13 +32,7 @@
 start(_, []) ->
     case supervisor:start_link({local, kernel_sup}, kernel, []) of
 	{ok, Pid} ->
-            %% add signal handler
-            case whereis(erl_signal_server) of
-                %% in case of minimal mode
-                undefined -> ok;
-                _ ->
-                    ok = gen_event:add_handler(erl_signal_server, erl_signal_handler, [])
-            end,
+            ok = erl_signal_handler:start(),
             %% add error handler
             case logger:setup_standard_handler() of
                 ok -> {ok, Pid, []};