The patch titled
     i386: fix NMI watchdog not reserving its MSRs
has been added to the -mm tree.  Its filename is
     i386-fix-nmi-watchdog-not-reserving-its-msrs.patch

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

------------------------------------------------------
Subject: i386: fix NMI watchdog not reserving its MSRs
From: Bjorn Steinbrink <[EMAIL PROTECTED]>

At system boot time, the NMI watchdog no longer reserved its MSRs, allowing
other subsystems to mess with them.  Fix that.

Signed-off-by: Bjorn Steinbrink <[EMAIL PROTECTED]>
Cc: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---

 arch/i386/kernel/cpu/perfctr-watchdog.c |    6 ++++++
 1 files changed, 6 insertions(+)

diff -puN 
arch/i386/kernel/cpu/perfctr-watchdog.c~i386-fix-nmi-watchdog-not-reserving-its-msrs
 arch/i386/kernel/cpu/perfctr-watchdog.c
--- 
a/arch/i386/kernel/cpu/perfctr-watchdog.c~i386-fix-nmi-watchdog-not-reserving-its-msrs
+++ a/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))) {
_

Patches currently in -mm which might be from [EMAIL PROTECTED] are

i386-fix-nmi-watchdog-not-reserving-its-msrs.patch
i386-use-the-right-wrapper-to-disable-the-nmi-watchdog.patch
fix-interchanged-parameters-to-release_evntselperfctr_nmi.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to