diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:51:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-03 14:51:22 -0500 |
| commit | 03ed6a3aa600c48593c3984812fda2d5945ddb46 (patch) | |
| tree | 03d1357411424514943deffadbb9f287288998bd /kernel/watchdog.c | |
| parent | 4c37a4b53de2d08c469a6e4304cf2a17178200aa (diff) | |
| parent | a0a2b71bb750ffe9b3faa317cb6317f4ad109383 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix callchain hit bad cast on ascii display
arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU
watchdog: Improve initialisation error message and documentation
Diffstat (limited to 'kernel/watchdog.c')
| -rw-r--r-- | kernel/watchdog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 6e3c41a4024c..5b082156cd21 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
| @@ -364,7 +364,8 @@ static int watchdog_nmi_enable(int cpu) | |||
| 364 | goto out_save; | 364 | goto out_save; |
| 365 | } | 365 | } |
| 366 | 366 | ||
| 367 | printk(KERN_ERR "NMI watchdog failed to create perf event on cpu%i: %p\n", cpu, event); | 367 | printk(KERN_ERR "NMI watchdog disabled for cpu%i: unable to create perf event: %ld\n", |
| 368 | cpu, PTR_ERR(event)); | ||
| 368 | return PTR_ERR(event); | 369 | return PTR_ERR(event); |
| 369 | 370 | ||
| 370 | /* success path */ | 371 | /* success path */ |