aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2015-06-22 11:40:02 +0200
committerSverker Eriksson <[email protected]>2015-06-22 11:40:02 +0200
commit35b20eb172a077b363af37d27c320b759d42869d (patch)
treea0702b89f7c97a0263474bc555a172c9846ca8d0 /erts/emulator/beam
parentbc87f3feb4960be715ff36f3abe03fa25e96598e (diff)
parent0a54d9988e7803e7d190f504838c6fe83f79bc8f (diff)
downloadotp-35b20eb172a077b363af37d27c320b759d42869d.tar.gz
otp-35b20eb172a077b363af37d27c320b759d42869d.tar.bz2
otp-35b20eb172a077b363af37d27c320b759d42869d.zip
Merge branch 'sverk/nosmp-init-timer-wheel'
* sverk/nosmp-init-timer-wheel: erts: Fix timer wheel initialization bug for non smp
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_process.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 88c1b5c121..fa37d0a9c9 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -5496,6 +5496,7 @@ init_scheduler_data(ErtsSchedulerData* esdp, int num,
ErtsRunQueue* runq,
char** daww_ptr, size_t daww_sz)
{
+ esdp->timer_wheel = NULL;
#ifdef ERTS_SMP
erts_bits_init_state(&esdp->erl_bits_state);
esdp->match_pseudo_process = NULL;