Revert "smp: hotplug update from 3.5"

This reverts commit 543e3d1733b76544521ca5cc354b8a0fe77d3b6a.