diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-02-25 15:27:29 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-02-25 15:27:29 +0100 |
| commit | 93d2038e91854d4bc4fd75dac7005719a79949cd (patch) | |
| tree | 6e56bd00815e289a2792bbc2d21ca02ea4791ee7 /erts/etc/common | |
| parent | 87ed3fe4d7ddbc3c64d182032e9fe054600cf5ba (diff) | |
| parent | 0ca09ee90d6384e74d1b18ab0e05f2c05fc03905 (diff) | |
| download | otp-93d2038e91854d4bc4fd75dac7005719a79949cd.tar.gz otp-93d2038e91854d4bc4fd75dac7005719a79949cd.tar.bz2 otp-93d2038e91854d4bc4fd75dac7005719a79949cd.zip | |
Merge branch 'egil/heart-callback/OTP-13250' into maint
Diffstat (limited to 'erts/etc/common')
| -rw-r--r-- | erts/etc/common/heart.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c index 9571b83ffd..1a826221fb 100644 --- a/erts/etc/common/heart.c +++ b/erts/etc/common/heart.c @@ -472,10 +472,6 @@ message_loop(erlin_fd, erlout_fd) switch (mp->op) { case HEART_BEAT: timestamp(&last_received); -#ifdef USE_WATCHDOG - /* reset the hardware watchdog timer */ - wd_reset(); -#endif break; case SHUT_DOWN: return R_SHUT_DOWN; |