diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-04-16 12:28:21 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-04-16 12:28:21 +0200 |
| commit | 82670b1f264f14d6dd2502efe459d9478826a788 (patch) | |
| tree | 90a9656f686cfc9886f5801781b5aed0fed4454e /erts/emulator/beam/erl_bif_timer.c | |
| parent | c46ae84ffd858c8fa8ddb3bfbfb3607276173fb4 (diff) | |
| parent | c8a0eca92cdda27c3efdde261c9c32bd445a3794 (diff) | |
| download | otp-82670b1f264f14d6dd2502efe459d9478826a788.tar.gz otp-82670b1f264f14d6dd2502efe459d9478826a788.tar.bz2 otp-82670b1f264f14d6dd2502efe459d9478826a788.zip | |
Merge branch 'egil/refactor-message-queue-probes'
* egil/refactor-message-queue-probes:
erts: Refactor dtrace call probes
erts: Refactor erts_queue_message
Diffstat (limited to 'erts/emulator/beam/erl_bif_timer.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_timer.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_bif_timer.c b/erts/emulator/beam/erl_bif_timer.c index 0bd8d20c34..ac4a5644ac 100644 --- a/erts/emulator/beam/erl_bif_timer.c +++ b/erts/emulator/beam/erl_bif_timer.c @@ -373,11 +373,7 @@ bif_timer_timeout(ErtsBifTimer* btm) message = TUPLE3(hp, am_timeout, ref, message); } - erts_queue_message(rp, &rp_locks, bp, message, NIL -#ifdef USE_VM_PROBES - , NIL -#endif - ); + erts_queue_message(rp, &rp_locks, bp, message, NIL); erts_smp_proc_unlock(rp, rp_locks); } } |