Revert "smp: patches from mainline 3.5 to hopefully help with hotplug efficiency"

This reverts commit 63602a3b68cab02f2e5676379702c7498d54debc.