Merge branch 'rickard/time_api/OTP-11997'

* rickard/time_api/OTP-11997:
  Unbreak lcnt

4 files changed, 2 insertions, 4 deletions

diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index 5aeb5b2590..86d3416423 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -1171,7 +1171,6 @@ early_init(int *argc, char **argv) /*
 
     /* Creates threads on Windows that depend on the arguments, so has to be after erl_sys_args */
     erl_sys_init();
-    erts_early_init_time_sup();
 
     erts_ets_realloc_always_moves = 0;
     erts_ets_always_compress = 0;
diff --git a/erts/emulator/beam/erl_time.h b/erts/emulator/beam/erl_time.h
index f201a8b4e3..c9cda4d10e 100644
--- a/erts/emulator/beam/erl_time.h
+++ b/erts/emulator/beam/erl_time.h
@@ -77,7 +77,6 @@ void erts_cancel_smp_ptimer(ErtsSmpPTimer *ptimer);
 void erts_monitor_time_offset(Eterm id, Eterm ref);
 int erts_demonitor_time_offset(Eterm ref);
 
-void erts_early_init_time_sup(void);
 void erts_late_init_time_sup(void);
 
 /* timer-wheel api */
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c
index d47d1682d7..b809fa8316 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -765,8 +765,7 @@ erts_has_time_correction(void)
     return time_sup.r.o.correction;
 }
 
-void
-erts_early_init_time_sup(void)
+void erts_init_sys_time_sup(void)
 {
     ErtsSysInitTimeResult sys_init_time_res
 	= ERTS_SYS_INIT_TIME_RESULT_INITER;
diff --git a/erts/emulator/beam/sys.h b/erts/emulator/beam/sys.h
index aeb28e72f3..a0f35fef1b 100644
--- a/erts/emulator/beam/sys.h
+++ b/erts/emulator/beam/sys.h
@@ -724,6 +724,7 @@ typedef struct {
 #define ERTS_SYS_INIT_TIME_RESULT_INITER \
     {0, (ErtsMonotonicTime) -1, (ErtsMonotonicTime) 1}
 
+extern void erts_init_sys_time_sup(void);
 extern void sys_init_time(ErtsSysInitTimeResult *);
 extern void erts_deliver_time(void);
 extern void erts_time_remaining(SysTimeval *);