Solve some nasty descheduling races with a lock#10817

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

alexcrichton:sched-fixalexcrichton/rust:sched-fixCopy head branch name to clipboard