Revert "x86: fix compile error due to X86_TRAP_NMI use in asm files"

This reverts commit ccbc1a939dc5d459012e7d9e22986f99f6b737cd.

Revert the last commit : Revert "ACPI / sleep: pm_power_off needs more sanity checks to be installed