diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-06-07 11:25:59 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-07 11:25:59 +0000 |
| commit | 9e69214f56cd5031f684da71a9eb24fa7003d1f2 (patch) | |
| tree | 26446f5d6db24fc8a7246a6d637de9226fb0b9a1 /erts/emulator/beam/erl_alloc.c | |
| parent | 8f243a67b6a710b076964a7043de7adc99bfa6d5 (diff) | |
| download | otp-9e69214f56cd5031f684da71a9eb24fa7003d1f2.tar.gz otp-9e69214f56cd5031f684da71a9eb24fa7003d1f2.tar.bz2 otp-9e69214f56cd5031f684da71a9eb24fa7003d1f2.zip | |
Merge OTP-8681
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index f8823b85fe..16ae643ed9 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -2897,17 +2897,10 @@ unsigned long erts_alc_test(unsigned long op, } case 0xf10: { ethr_tid *tid = erts_alloc(ERTS_ALC_T_UNDEF, sizeof(ethr_tid)); -#ifdef ERTS_ENABLE_LOCK_COUNT - if (erts_lcnt_thr_create(tid, - (void * (*)(void *)) a1, - (void *) a2, - NULL) != 0) -#else if (ethr_thr_create(tid, (void * (*)(void *)) a1, (void *) a2, NULL) != 0) -#endif ERTS_ALC_TEST_ABORT; return (unsigned long) tid; } |