diff options
| author | Joe Perches <joe@perches.com> | 2010-11-05 19:12:38 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-10 04:23:58 -0500 |
| commit | 3cf9b85b474e656a0856b88290c7a289ac5ea247 (patch) | |
| tree | 31943d983a45ddedb4f811ca68513420fd308c68 | |
| parent | f6614b7bb405a9b35dd28baea989a749492c46b2 (diff) | |
locking, lockdep: Convert sprintf_symbol to %pS
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Jiri Kosina <trivial@kernel.org>
LKML-Reference: <1288998760-11775-6-git-send-email-joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | kernel/lockdep_proc.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index 59b76c8ce9d7..1969d2fc4b36 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c | |||
| @@ -494,7 +494,6 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data) | |||
| 494 | namelen += 2; | 494 | namelen += 2; |
| 495 | 495 | ||
| 496 | for (i = 0; i < LOCKSTAT_POINTS; i++) { | 496 | for (i = 0; i < LOCKSTAT_POINTS; i++) { |
| 497 | char sym[KSYM_SYMBOL_LEN]; | ||
| 498 | char ip[32]; | 497 | char ip[32]; |
| 499 | 498 | ||
| 500 | if (class->contention_point[i] == 0) | 499 | if (class->contention_point[i] == 0) |
| @@ -503,15 +502,13 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data) | |||
| 503 | if (!i) | 502 | if (!i) |
| 504 | seq_line(m, '-', 40-namelen, namelen); | 503 | seq_line(m, '-', 40-namelen, namelen); |
| 505 | 504 | ||
| 506 | sprint_symbol(sym, class->contention_point[i]); | ||
| 507 | snprintf(ip, sizeof(ip), "[<%p>]", | 505 | snprintf(ip, sizeof(ip), "[<%p>]", |
| 508 | (void *)class->contention_point[i]); | 506 | (void *)class->contention_point[i]); |
| 509 | seq_printf(m, "%40s %14lu %29s %s\n", name, | 507 | seq_printf(m, "%40s %14lu %29s %pS\n", |
| 510 | stats->contention_point[i], | 508 | name, stats->contention_point[i], |
| 511 | ip, sym); | 509 | ip, (void *)class->contention_point[i]); |
| 512 | } | 510 | } |
| 513 | for (i = 0; i < LOCKSTAT_POINTS; i++) { | 511 | for (i = 0; i < LOCKSTAT_POINTS; i++) { |
| 514 | char sym[KSYM_SYMBOL_LEN]; | ||
| 515 | char ip[32]; | 512 | char ip[32]; |
| 516 | 513 | ||
| 517 | if (class->contending_point[i] == 0) | 514 | if (class->contending_point[i] == 0) |
| @@ -520,12 +517,11 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data) | |||
| 520 | if (!i) | 517 | if (!i) |
| 521 | seq_line(m, '-', 40-namelen, namelen); | 518 | seq_line(m, '-', 40-namelen, namelen); |
| 522 | 519 | ||
| 523 | sprint_symbol(sym, class->contending_point[i]); | ||
| 524 | snprintf(ip, sizeof(ip), "[<%p>]", | 520 | snprintf(ip, sizeof(ip), "[<%p>]", |
| 525 | (void *)class->contending_point[i]); | 521 | (void *)class->contending_point[i]); |
| 526 | seq_printf(m, "%40s %14lu %29s %s\n", name, | 522 | seq_printf(m, "%40s %14lu %29s %pS\n", |
| 527 | stats->contending_point[i], | 523 | name, stats->contending_point[i], |
| 528 | ip, sym); | 524 | ip, (void *)class->contending_point[i]); |
| 529 | } | 525 | } |
| 530 | if (i) { | 526 | if (i) { |
| 531 | seq_puts(m, "\n"); | 527 | seq_puts(m, "\n"); |
