Messages in this thread Patch in this message | | | From | Andi Kleen <> | Subject | [PATCH 2.6.22] [5/5] i386: Handle P6s without performance counters in nmi watchdog | Date | Wed, 15 Aug 2007 12:38:58 +0200 (CEST) |
| |
I got an oops while booting a 32bit kernel on KVM because it doesn't implement performance counters used by the NMI watchdog. Handle this case.
Cc: avi@qumranet.com
Signed-off-by: Andi Kleen <ak@suse.de>
--- arch/i386/kernel/cpu/perfctr-watchdog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Index: linux-2.6.22-stable/arch/i386/kernel/cpu/perfctr-watchdog.c =================================================================== --- linux-2.6.22-stable.orig/arch/i386/kernel/cpu/perfctr-watchdog.c +++ linux-2.6.22-stable/arch/i386/kernel/cpu/perfctr-watchdog.c @@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nm perfctr_msr = MSR_P6_PERFCTR0; evntsel_msr = MSR_P6_EVNTSEL0; - wrmsrl(perfctr_msr, 0UL); + /* KVM doesn't implement this MSR */ + if (wrmsr_safe(perfctr_msr, 0, 0) < 0) + return 0; evntsel = P6_EVNTSEL_INT | P6_EVNTSEL_OS - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |