hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2017-02-11 10:16:05 -08:00
parent 21a7061c5e bfeda41d06
commit 4e4f74a7ee
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/stacktrace.c
View File

@ -18,10 +18,8 @@ void print_stack_trace(struct stack_trace *trace, int spaces)
if (WARN_ON(!trace->entries)) if (WARN_ON(!trace->entries))
return; return;
for (i = 0; i < trace->nr_entries; i++) { for (i = 0; i < trace->nr_entries; i++)
printk("%*c", 1 + spaces, ' '); printk("%*c%pS\n", 1 + spaces, ' ', (void *)trace->entries[i]);
print_ip_sym(trace->entries[i]);
}
} }
EXPORT_SYMBOL_GPL(print_stack_trace); EXPORT_SYMBOL_GPL(print_stack_trace);
@ -29,7 +27,6 @@ int snprint_stack_trace(char *buf, size_t size,
struct stack_trace *trace, int spaces) struct stack_trace *trace, int spaces)
{ {
int i; int i;
unsigned long ip;
int generated; int generated;
int total = 0; int total = 0;
@ -37,9 +34,8 @@ int snprint_stack_trace(char *buf, size_t size,
return 0; return 0;
for (i = 0; i < trace->nr_entries; i++) { for (i = 0; i < trace->nr_entries; i++) {
ip = trace->entries[i]; generated = snprintf(buf, size, "%*c%pS\n", 1 + spaces, ' ',
generated = snprintf(buf, size, "%*c[<%p>] %pS\n", (void *)trace->entries[i]);
1 + spaces, ' ', (void *) ip, (void *) ip);
total += generated; total += generated;