This fixes a merge-window regression due to a conflict between error injection and preparation to remove atomicio.c Here we fix that regression and complete the removal of atomicio.c. This also re-orders some idle initializtion code to complete the merge window series that allows cpuidle to cope with bringing processors on-line after boot. Please let me know if you see issues with any of these patches. thanks, Len Brown, Intel Open Source Technolgy Center -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html