diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-08-06 19:04:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:13 -0400 |
commit | 656c3b79f782a235413087168b61ff279034d860 (patch) | |
tree | 6c726bc781bcc0b8873a3a03f779e74069456110 /kernel | |
parent | 1b7f8ba603d3bb2f5bbb65df981ae0d0abb80ee2 (diff) |
kernel/watchdog.c: convert printk/pr_warning to pr_foo()
Replace some obsolete functions.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/watchdog.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index c3319bd1b040..51b29e9d2ba6 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c | |||
@@ -260,9 +260,11 @@ static void watchdog_overflow_callback(struct perf_event *event, | |||
260 | return; | 260 | return; |
261 | 261 | ||
262 | if (hardlockup_panic) | 262 | if (hardlockup_panic) |
263 | panic("Watchdog detected hard LOCKUP on cpu %d", this_cpu); | 263 | panic("Watchdog detected hard LOCKUP on cpu %d", |
264 | this_cpu); | ||
264 | else | 265 | else |
265 | WARN(1, "Watchdog detected hard LOCKUP on cpu %d", this_cpu); | 266 | WARN(1, "Watchdog detected hard LOCKUP on cpu %d", |
267 | this_cpu); | ||
266 | 268 | ||
267 | __this_cpu_write(hard_watchdog_warn, true); | 269 | __this_cpu_write(hard_watchdog_warn, true); |
268 | return; | 270 | return; |
@@ -345,7 +347,7 @@ static enum hrtimer_restart watchdog_timer_fn(struct hrtimer *hrtimer) | |||
345 | } | 347 | } |
346 | } | 348 | } |
347 | 349 | ||
348 | printk(KERN_EMERG "BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n", | 350 | pr_emerg("BUG: soft lockup - CPU#%d stuck for %us! [%s:%d]\n", |
349 | smp_processor_id(), duration, | 351 | smp_processor_id(), duration, |
350 | current->comm, task_pid_nr(current)); | 352 | current->comm, task_pid_nr(current)); |
351 | print_modules(); | 353 | print_modules(); |
@@ -484,7 +486,7 @@ static int watchdog_nmi_enable(unsigned int cpu) | |||
484 | if (PTR_ERR(event) == -EOPNOTSUPP) | 486 | if (PTR_ERR(event) == -EOPNOTSUPP) |
485 | pr_info("disabled (cpu%i): not supported (no LAPIC?)\n", cpu); | 487 | pr_info("disabled (cpu%i): not supported (no LAPIC?)\n", cpu); |
486 | else if (PTR_ERR(event) == -ENOENT) | 488 | else if (PTR_ERR(event) == -ENOENT) |
487 | pr_warning("disabled (cpu%i): hardware events not enabled\n", | 489 | pr_warn("disabled (cpu%i): hardware events not enabled\n", |
488 | cpu); | 490 | cpu); |
489 | else | 491 | else |
490 | pr_err("disabled (cpu%i): unable to create perf event: %ld\n", | 492 | pr_err("disabled (cpu%i): unable to create perf event: %ld\n", |