smp: patches from mainline 3.5 to hopefully help with hotplug fix