Commit faa4cfa6 authored by Björn Steinbrink's avatar Björn Steinbrink Committed by Linus Torvalds

i386: fix NMI watchdog not reserving its MSRs

At system boot time, the NMI watchdog no longer reserved its MSRs, allowing
other subsystems to mess with them.  Fix that.
Signed-off-by: default avatarBjörn Steinbrink <B.Steinbrink@gmx.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38ad2ed0
...@@ -614,6 +614,12 @@ int lapic_watchdog_init(unsigned nmi_hz) ...@@ -614,6 +614,12 @@ int lapic_watchdog_init(unsigned nmi_hz)
probe_nmi_watchdog(); probe_nmi_watchdog();
if (!wd_ops) if (!wd_ops)
return -1; return -1;
if (!wd_ops->reserve()) {
printk(KERN_ERR
"NMI watchdog: cannot reserve perfctrs\n");
return -1;
}
} }
if (!(wd_ops->setup(nmi_hz))) { if (!(wd_ops->setup(nmi_hz))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment