diff options
| author | Rickard Green <[email protected]> | 2011-11-13 21:42:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-13 21:42:11 +0100 |
| commit | 73ee2e00fe0389d0362e89a74d1909510da9e0fd (patch) | |
| tree | b75c2a8b4b77885c6864ffd4f2d4825cb781c103 /erts/emulator/beam/erl_vm.h | |
| parent | c12befbdc957f7f166598c6d5143ce27a0d10fa8 (diff) | |
| parent | bc5818cfdd56e19a16357f4443d80a56426aa134 (diff) | |
| download | otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.tar.gz otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.tar.bz2 otp-73ee2e00fe0389d0362e89a74d1909510da9e0fd.zip | |
Merge branch 'rickard/thr-progress-block/OTP-9631'
* rickard/thr-progress-block/OTP-9631:
Replace system block with thread progress block
Diffstat (limited to 'erts/emulator/beam/erl_vm.h')
| -rw-r--r-- | erts/emulator/beam/erl_vm.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_vm.h b/erts/emulator/beam/erl_vm.h index f810392e60..5dc307e383 100644 --- a/erts/emulator/beam/erl_vm.h +++ b/erts/emulator/beam/erl_vm.h @@ -83,11 +83,7 @@ #define CP_SIZE 1 #define ErtsHAllocLockCheck(P) \ - ERTS_SMP_LC_ASSERT((ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks((P))) \ - || ((P)->id == ERTS_INVALID_PID) \ - || ((P)->scheduler_data \ - && (P) == (P)->scheduler_data->match_pseudo_process) \ - || erts_is_system_blocked(0)) + ERTS_SMP_LC_ASSERT(erts_dbg_check_halloc_lock((P))) #ifdef DEBUG |