diff options
| author | Micael Karlberg <[email protected]> | 2011-09-26 18:04:52 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-26 18:04:52 +0200 |
| commit | adacb706e77b90a9284c3f4d8c828992c9acebf8 (patch) | |
| tree | b801a4e1f5927642d5379e6be09ddf837ca8672b /erts | |
| parent | 3f5c0bf1f17d5c9d6f1b4dad5a9944e844c5393f (diff) | |
| parent | 1eb09dda09fa3de6b05f09d881065a0a7de2624f (diff) | |
| download | otp-adacb706e77b90a9284c3f4d8c828992c9acebf8.tar.gz otp-adacb706e77b90a9284c3f4d8c828992c9acebf8.tar.bz2 otp-adacb706e77b90a9284c3f4d8c828992c9acebf8.zip | |
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 44d2683fe0..5ceb4ce9a8 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -1152,13 +1152,6 @@ scheduler_wait(int *fcalls, ErtsSchedulerData *esdp, ErtsRunQueue *rq) ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING)); goto sys_woken; } - if (!(flgs & ERTS_SSI_FLG_SLEEPING)) { - flgs = sched_prep_cont_spin_wait(ssi); - if (!(flgs & ERTS_SSI_FLG_WAITING)) { - ASSERT(!(flgs & ERTS_SSI_FLG_SLEEPING)); - goto sys_woken; - } - } /* * If we got new I/O tasks we aren't allowed to |