From f25d234ff12fdcda0a27c85a21cd64896f5712a9 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Fri, 12 Feb 2010 17:19:20 -0500 Subject: [PATCH] --- yaml --- r: 205380 b: refs/heads/master c: cf454aecb31741a0438ed1201b3dd153c7c7b19a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/nmi_watchdog.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 811ddcfa5545..c1119f6fef9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 504d7cf10ee42bb76b9556859f23d4121dee0a77 +refs/heads/master: cf454aecb31741a0438ed1201b3dd153c7c7b19a diff --git a/trunk/kernel/nmi_watchdog.c b/trunk/kernel/nmi_watchdog.c index 73c1954a97bb..4f23505d887d 100644 --- a/trunk/kernel/nmi_watchdog.c +++ b/trunk/kernel/nmi_watchdog.c @@ -166,8 +166,12 @@ cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) wd_attr.sample_period = hw_nmi_get_sample_period(); event = perf_event_create_kernel_counter(&wd_attr, hotcpu, -1, wd_overflow); if (IS_ERR(event)) { - printk(KERN_ERR "nmi watchdog failed to create perf event on %i: %p\n", hotcpu, event); - return NOTIFY_BAD; + wd_attr.type = PERF_TYPE_SOFTWARE; + event = perf_event_create_kernel_counter(&wd_attr, hotcpu, -1, wd_overflow); + if (IS_ERR(event)) { + printk(KERN_ERR "nmi watchdog failed to create perf event on %i: %p\n", hotcpu, event); + return NOTIFY_BAD; + } } per_cpu(nmi_watchdog_ev, hotcpu) = event; perf_event_enable(per_cpu(nmi_watchdog_ev, hotcpu));