From 9cb0098e488c9268ffcb80a41d6072dda998cb5a Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sun, 22 Jul 2007 11:12:39 +0200 Subject: [PATCH] --- yaml --- r: 62483 b: refs/heads/master c: 57c22f49e4c7d27a03e109a317c30b12f1bae0b2 h: refs/heads/master i: 62481: 6407895de7898e360a78389b81dc1b993ac7c137 62479: bff50fd4af3685c6c3630c69b0a8edb42de3e168 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/cpu/perfctr-watchdog.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3440d4211c77..aa3104d4e3ce 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f25f64ed5bd3c2932493681bdfdb483ea707da0a +refs/heads/master: 57c22f49e4c7d27a03e109a317c30b12f1bae0b2 diff --git a/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c b/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c index 30b5e48aa76b..572900398def 100644 --- a/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c +++ b/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c @@ -346,7 +346,9 @@ static int setup_p6_watchdog(unsigned nmi_hz) 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