kernel - Fix some rare pmap races in i386 and x86_64 (followup)