Squashed revert of smpboot feature