aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_process.c
diff options
context:
space:
mode:
authorLars Thorsen <[email protected]>2011-09-26 10:27:50 +0200
committerLars Thorsen <[email protected]>2011-09-26 10:27:50 +0200
commitf8a45f101ef47ff9d1e7f51e1989661ab8114107 (patch)
tree4a212467c9f4719078e80170d60b82aa1ec71611 /erts/emulator/beam/erl_process.c
parent1ead5e977d307ae391fdfd34e28fa5d587db2855 (diff)
parent3992f3308fd2d84e46f930e4181ee29d2389ff96 (diff)
downloadotp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.tar.gz
otp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.tar.bz2
otp-f8a45f101ef47ff9d1e7f51e1989661ab8114107.zip
Merge branch 'dev' into major
* dev: [erl_docgen] Missing header level in PDF bookmarks menu Fixed version, release notes and appup in prep for release. Fix lost wakeup of scheduler when enqueuing auxiliary work
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
-rw-r--r--erts/emulator/beam/erl_process.c7
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