Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e4f74a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 21a7061c bfeda41d

kernel/stacktrace.c

+4 −8
Original line number Diff line number Diff line
@@ -18,10 +18,8 @@ void print_stack_trace(struct stack_trace *trace, int spaces) 
	if (WARN_ON(!trace->entries))

		return;



	for (i = 0; i < trace->nr_entries; i++) {

		printk("%*c", 1 + spaces, ' ');

		print_ip_sym(trace->entries[i]);

	}

	for (i = 0; i < trace->nr_entries; i++)

		printk("%*c%pS\n", 1 + spaces, ' ', (void *)trace->entries[i]);

}

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)

{

	int i;

	unsigned long ip;

	int generated;

	int total = 0;
@@ -37,9 +34,8 @@ int snprint_stack_trace(char *buf, size_t size, 
		return 0;



	for (i = 0; i < trace->nr_entries; i++) {

		ip = trace->entries[i];

		generated = snprintf(buf, size, "%*c[<%p>] %pS\n",

				1 + spaces, ' ', (void *) ip, (void *) ip);

		generated = snprintf(buf, size, "%*c%pS\n", 1 + spaces, ' ',

				     (void *)trace->entries[i]);



		total += generated;