diff options
| author | Patrik Nyblom <[email protected]> | 2012-03-22 19:08:07 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-03-22 19:08:07 +0100 |
| commit | 8a886bda04b7656f9f6ced9be14a98d6b6df0a0a (patch) | |
| tree | a0a201c8b1ee29169aca97e3befa133da867d5cd /erts/emulator/beam/erl_alloc.c | |
| parent | aa0d3a28d6f8350965d43cd13014125a63ac25d9 (diff) | |
| parent | 5957a8338fe1f4e79a39277174094bbd9e978896 (diff) | |
| download | otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.tar.gz otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.tar.bz2 otp-8a886bda04b7656f9f6ced9be14a98d6b6df0a0a.zip | |
Merge branch 'maint'
Conflicts:
erts/emulator/beam/beam_emu.c
erts/emulator/beam/bif.tab
erts/preloaded/ebin/prim_file.beam
lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index ac92822aca..c501b79b1f 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -3001,7 +3001,11 @@ reply_alloc_info(void *vair) HRelease(rp, hp_end, hp); } - erts_queue_message(rp, &rp_locks, bp, msg, NIL); + erts_queue_message(rp, &rp_locks, bp, msg, NIL +#ifdef USE_VM_PROBES + , NIL +#endif + ); if (air->req_sched == sched_id) rp_locks &= ~ERTS_PROC_LOCK_MAIN; |