-
Mikael Pettersson authored
I managed to add a bug to the local APIC NMI watchdog's resume procedure in the driver model conversion for 2.5.67. The problem is that the resume procedure simply calls the enable procedure. If the NMI watchdog has been disabled by another driver (like oprofile or perfctr), then the NMI watchdog will incorrectly be re-enabled. I discovered this when updating the perfctr driver for 2.5.67 and seeing unexpected NMIs after a resume from apm --suspend. We can fix this by unregistering the NMI watchdog from the driver model when disabling it (like the code did before the driver model changes), or by remembering the previous state at suspend and checking it at resume. The patch below uses the second, simpler, approach. Tested, please apply.
d8ff1505