d1295abdc0
out of cpu_switch() and into pmap_activate() where they belong. This also removes all the #ifdef from cpu_switch().