diff options
author | Rickard Green <[email protected]> | 2018-09-06 14:21:34 +0200 |
---|---|---|
committer | Rickard Green <[email protected]> | 2018-09-06 14:21:34 +0200 |
commit | 60f9f349e1fc88d562fe7d6ef3faebbd22ed2308 (patch) | |
tree | 1ecda66f42d8e730e4f45145db3aef626cb5df19 /erts/emulator/beam/dist.c | |
parent | 66354420943f2fdc087f1d6f5420e4efb82a3a9e (diff) | |
parent | eb538b5bff24ba3144f0646e1a24174e62218479 (diff) | |
download | otp-60f9f349e1fc88d562fe7d6ef3faebbd22ed2308.tar.gz otp-60f9f349e1fc88d562fe7d6ef3faebbd22ed2308.tar.bz2 otp-60f9f349e1fc88d562fe7d6ef3faebbd22ed2308.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
kernel: Fix missing abort_connection in net_kernel
Prevent inconsistent node lists
Fix an endless rescheduling loop when a process is executing process_info(self(), ...)
Diffstat (limited to 'erts/emulator/beam/dist.c')
-rw-r--r-- | erts/emulator/beam/dist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c index db594a23a0..e7c0ee65dc 100644 --- a/erts/emulator/beam/dist.c +++ b/erts/emulator/beam/dist.c @@ -3621,6 +3621,12 @@ static Sint abort_connection(DistEntry* dep, Uint32 conn_id) return 0; } +Sint +erts_abort_connection(DistEntry *dep, Uint32 conn_id) +{ + return abort_connection(dep, conn_id); +} + BIF_RETTYPE erts_internal_abort_connection_2(BIF_ALIST_2) { DistEntry* dep; |