diff options
| author | Björn Steinbrink <B.Steinbrink@gmx.de> | 2007-06-16 10:15:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-16 13:16:15 -0700 |
| commit | faa4cfa6b334fc07c3386e620a2fb55de508c077 (patch) | |
| tree | a9b38265f7f9ea71f9489ec9d69c5f98d843d037 | |
| parent | 38ad2ed08d89a4b830a03131fa73e4ef3e98d9f4 (diff) | |
| download | op-kernel-dev-faa4cfa6b334fc07c3386e620a2fb55de508c077.zip op-kernel-dev-faa4cfa6b334fc07c3386e620a2fb55de508c077.tar.gz | |
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: Björn Steinbrink <B.Steinbrink@gmx.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/i386/kernel/cpu/perfctr-watchdog.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c index 2b04c8f..8343244 100644 --- a/arch/i386/kernel/cpu/perfctr-watchdog.c +++ b/arch/i386/kernel/cpu/perfctr-watchdog.c @@ -614,6 +614,12 @@ int lapic_watchdog_init(unsigned nmi_hz) probe_nmi_watchdog(); if (!wd_ops) return -1; + + if (!wd_ops->reserve()) { + printk(KERN_ERR + "NMI watchdog: cannot reserve perfctrs\n"); + return -1; + } } if (!(wd_ops->setup(nmi_hz))) { |
