lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.37' into perf/core

Browse Source 
Merge reason: Add the final .37 tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2011-01-05 14:22:08 +01:00
parent 20c457b858 3c0eee3fe6
commit aef1b9cef7
78 changed files with 725 additions and 754 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/watchdog.c
View File

@@ -366,7 +366,8 @@ static int watchdog_nmi_enable(int cpu)
goto out_save;
}
printk(KERN_ERR "NMI watchdog failed to create perf event on cpu%i: %p\n", cpu, event);
printk(KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n",
cpu, PTR_ERR(event));
return PTR_ERR(event);
/* success path */