aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/bif.c
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-03-29 14:54:24 +0200
committerRickard Green <[email protected]>2016-03-29 14:54:24 +0200
commit96a0a707c6a7ba7ce9d6668705ca10c66666a8c3 (patch)
tree9f55aa77dae8b5875358fab76338dc3ec3c6cbba /erts/emulator/beam/bif.c
parent60479cec6169d3d3495f5e8e6cadee30d22a4d60 (diff)
parentab884c3fdda00479d636de82d68ffbd8628c5c20 (diff)
downloadotp-96a0a707c6a7ba7ce9d6668705ca10c66666a8c3.tar.gz
otp-96a0a707c6a7ba7ce9d6668705ca10c66666a8c3.tar.bz2
otp-96a0a707c6a7ba7ce9d6668705ca10c66666a8c3.zip
Merge branch 'rickard/improve-psd/OTP-13428'
* rickard/improve-psd/OTP-13428: Improve process/port specific data management
Diffstat (limited to 'erts/emulator/beam/bif.c')
-rw-r--r--erts/emulator/beam/bif.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 37bb28c6f8..97d690db9f 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -1567,7 +1567,7 @@ static BIF_RETTYPE process_flag_aux(Process *BIF_P,
scb->n = 0;
}
- scb = ERTS_PROC_SET_SAVED_CALLS_BUF(rp, ERTS_PROC_LOCK_MAIN, scb);
+ scb = ERTS_PROC_SET_SAVED_CALLS_BUF(rp, scb);
if (!scb)
old_value = make_small(0);
@@ -1595,9 +1595,7 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2)
if (is_not_atom(BIF_ARG_2)) {
goto error;
}
- old_value = erts_proc_set_error_handler(BIF_P,
- ERTS_PROC_LOCK_MAIN,
- BIF_ARG_2);
+ old_value = erts_proc_set_error_handler(BIF_P, BIF_ARG_2);
BIF_RET(old_value);
}
else if (BIF_ARG_1 == am_priority) {