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

This reverts commit e965b9f75669a6033b30c82f97ef7b032182b32f.