Revert "SMP: Fix a error introduced in 36b676ee and fully decouple disabling of pre-emption from critical sections." This reverts commit 9aedf1bd.
