Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull lockdep fix from Ingo Molnar:
"This fixes an ugly lockdep stack trace output regression. (But also
affects other stacktrace users such as kmemleak, KASAN, etc)"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
stacktrace, lockdep: Fix address, newline ugliness
+4
-8
+4
-8
kernel/stacktrace.c
+4
-8
kernel/stacktrace.c
···
18
18
if (WARN_ON(!trace->entries))
19
19
return;
20
20
21
-
for (i = 0; i < trace->nr_entries; i++) {
22
-
printk("%*c", 1 + spaces, ' ');
23
-
print_ip_sym(trace->entries[i]);
24
-
}
21
+
for (i = 0; i < trace->nr_entries; i++)
22
+
printk("%*c%pS\n", 1 + spaces, ' ', (void *)trace->entries[i]);
25
23
}
26
24
EXPORT_SYMBOL_GPL(print_stack_trace);
27
25
···
27
29
struct stack_trace *trace, int spaces)
28
30
{
29
31
int i;
30
-
unsigned long ip;
31
32
int generated;
32
33
int total = 0;
33
34
···
34
37
return 0;
35
38
36
39
for (i = 0; i < trace->nr_entries; i++) {
37
-
ip = trace->entries[i];
38
-
generated = snprintf(buf, size, "%*c[<%p>] %pS\n",
39
-
1 + spaces, ' ', (void *) ip, (void *) ip);
40
+
generated = snprintf(buf, size, "%*c%pS\n", 1 + spaces, ' ',
41
+
(void *)trace->entries[i]);
40
42
41
43
total += generated;
42
44