diff options
| author | Micael Karlberg <[email protected]> | 2011-09-26 11:10:16 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-26 11:10:16 +0200 |
| commit | f8f0c5a1bc435fbb9d816323f1f0abfe992a6e3e (patch) | |
| tree | 88d99b425afb35fcaf7f9c804b874776f2ab7d66 /erts | |
| parent | 225be8638c5d1ae82f83f00557c75cdf25ac6bbc (diff) | |
| parent | 8aeee5940d632414afa15d7d85489220abc79547 (diff) | |
| download | otp-f8f0c5a1bc435fbb9d816323f1f0abfe992a6e3e.tar.gz otp-f8f0c5a1bc435fbb9d816323f1f0abfe992a6e3e.tar.bz2 otp-f8f0c5a1bc435fbb9d816323f1f0abfe992a6e3e.zip | |
Merge branch 'major' of super:otp into major
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 |