diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 13:22:34 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-01-04 13:22:34 +0100 |
commit | 195be9a44f2481b9c575c8ad286f4d2278b831b3 (patch) | |
tree | 96f053438a1fc25b180bccbde8fbe86a1fc583d2 /erts/emulator/beam/erl_sock.h | |
parent | 8fcb51b8d5a4977971aba5ce8bc0f3c500a7c7d7 (diff) | |
parent | 4a8ce05083b9c88b94560f400370dbc656893b6e (diff) | |
download | otp-195be9a44f2481b9c575c8ad286f4d2278b831b3.tar.gz otp-195be9a44f2481b9c575c8ad286f4d2278b831b3.tar.bz2 otp-195be9a44f2481b9c575c8ad286f4d2278b831b3.zip |
Merge branch 'egil/system_profile-profiler-fix/OTP-9849' into maint
* egil/system_profile-profiler-fix/OTP-9849:
erts: Do not profile system profiler pid
test: system_profile profiler pid is not profiled
Remove line macros in system_profile_SUITE
Diffstat (limited to 'erts/emulator/beam/erl_sock.h')
0 files changed, 0 insertions, 0 deletions