diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 15:32:06 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2015-06-17 15:32:06 +0200 |
| commit | 4d3672766e6b9c2ec70768706a893486010e0157 (patch) | |
| tree | 54e8e395f54443d59dd272ee32c44bd3c1421b23 /erts/emulator/beam/erl_alloc.c | |
| parent | 1018f21841111f0f859bd3531e32773cc7dfcd1f (diff) | |
| parent | 8e70bbb3a94b09600bf7ac9d3b18713502a64625 (diff) | |
| download | otp-4d3672766e6b9c2ec70768706a893486010e0157.tar.gz otp-4d3672766e6b9c2ec70768706a893486010e0157.tar.bz2 otp-4d3672766e6b9c2ec70768706a893486010e0157.zip | |
Merge branch 'egil/license-compliance/OTP-12848'
* egil/license-compliance/OTP-12848:
Revert "lcnt: Let runq locks reflect actual call location"
Revert "Demote rare debug slogan of message discarding to debug build"
Revert "Add missing error string to syslog logging in epmd"
Revert "Add run queue index to process dump info"
Revert "Add thread index to allocator enomem dump slogan"
Revert "Add number of entries to mnesia copy debug message"
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index d11f24220a..c9ac024743 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1884,8 +1884,8 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...) size = va_arg(argp, Uint); va_end(argp); erl_exit(1, - "%s: Cannot %s %lu bytes of memory (of type \"%s\", thread %d).\n", - allctr_str, op, size, t_str, ERTS_ALC_GET_THR_IX()); + "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n", + allctr_str, op, size, t_str); break; } case ERTS_ALC_E_NOALLCTR: |