Disable NMI watchdog by default properly

This reverts commit 6ebf622b and
replaces it with one that actually works.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>