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

locking, lockdep: Convert sprintf_symbol to %pS

Browse Source 
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>
This commit is contained in:
Joe Perches
2010-11-05 16:12:38 -07:00
committed by Ingo Molnar
parent f6614b7bb4
commit 3cf9b85b47
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/lockdep_proc.c
View File

@@ -494,7 +494,6 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
namelen += 2; namelen += 2;
for (i = 0; i < LOCKSTAT_POINTS; i++) { for (i = 0; i < LOCKSTAT_POINTS; i++) {
char sym[KSYM_SYMBOL_LEN];
char ip[32]; char ip[32];
if (class->contention_point[i] == 0) if (class->contention_point[i] == 0)
@@ -503,15 +502,13 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
if (!i) if (!i)
seq_line(m, '-', 40-namelen, namelen); seq_line(m, '-', 40-namelen, namelen);
sprint_symbol(sym, class->contention_point[i]);
snprintf(ip, sizeof(ip), "[<%p>]", snprintf(ip, sizeof(ip), "[<%p>]",
(void *)class->contention_point[i]); (void *)class->contention_point[i]);
seq_printf(m, "%40s %14lu %29s %s\n", name, seq_printf(m, "%40s %14lu %29s %pS\n",
stats->contention_point[i], name, stats->contention_point[i],
ip, sym); ip, (void *)class->contention_point[i]);
} }
for (i = 0; i < LOCKSTAT_POINTS; i++) { for (i = 0; i < LOCKSTAT_POINTS; i++) {
char sym[KSYM_SYMBOL_LEN];
char ip[32]; char ip[32];
if (class->contending_point[i] == 0) if (class->contending_point[i] == 0)
@@ -520,12 +517,11 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
if (!i) if (!i)
seq_line(m, '-', 40-namelen, namelen); seq_line(m, '-', 40-namelen, namelen);
sprint_symbol(sym, class->contending_point[i]);
snprintf(ip, sizeof(ip), "[<%p>]", snprintf(ip, sizeof(ip), "[<%p>]",
(void *)class->contending_point[i]); (void *)class->contending_point[i]);
seq_printf(m, "%40s %14lu %29s %s\n", name, seq_printf(m, "%40s %14lu %29s %pS\n",
stats->contending_point[i], name, stats->contending_point[i],
ip, sym); ip, (void *)class->contending_point[i]);
} }
if (i) { if (i) {
seq_puts(m, "\n"); seq_puts(m, "\n");