diff options
| author | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-12-01 09:46:56 +0100 |
| commit | 736bd3aa619244786c32c882001604210f846fa4 (patch) | |
| tree | da11794c3c2cef789a51ff861d7e2b1b1b244d82 /erts/emulator/beam/bif.c | |
| parent | 40653b86e7812fcbcdc73f2becdfbcc43f8814e7 (diff) | |
| parent | 8781932b3b8769b6f208ac7c00471122ec7dd055 (diff) | |
| download | otp-736bd3aa619244786c32c882001604210f846fa4.tar.gz otp-736bd3aa619244786c32c882001604210f846fa4.tar.bz2 otp-736bd3aa619244786c32c882001604210f846fa4.zip | |
Merge branch 'rickard/rm-common-runq/OTP-9727'
* rickard/rm-common-runq/OTP-9727:
Remove common run-queue in SMP case
Fix scheduler suspend bug
Conflicts:
erts/emulator/beam/erl_init.c
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 8ab363a1ec..f5616af95e 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -870,8 +870,6 @@ BIF_RETTYPE spawn_opt_1(BIF_ALIST_1) } } else if (arg == am_scheduler && is_small(val)) { Sint scheduler = signed_val(val); - if (erts_common_run_queue && erts_no_schedulers > 1) - goto error; if (scheduler < 0 || erts_no_schedulers < scheduler) goto error; so.scheduler = (int) scheduler; @@ -1535,8 +1533,6 @@ BIF_RETTYPE process_flag_2(BIF_ALIST_2) ErtsRunQueue *old; ErtsRunQueue *new; Sint sched; - if (erts_common_run_queue && erts_no_schedulers > 1) - goto error; if (!is_small(BIF_ARG_2)) goto error; sched = signed_val(BIF_ARG_2); |