Skip to content

Commit 41ba485

Browse files
committed
Merge tag 'trace-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt: "Eiichi Tsukata found a small bug from the fixup of the stack code Removing ULONG_MAX as the marker for the user stack trace end, made the tracing code not know where the end is. The end is now marked with a zero (NULL) pointer. Eiichi fixed this in the tracing code" * tag 'trace-v5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Fix user stack trace "??" output
2 parents a84d2d2 + 6d54ceb commit 41ba485

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

kernel/trace/trace_output.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,17 +1109,10 @@ static enum print_line_t trace_user_stack_print(struct trace_iterator *iter,
11091109
for (i = 0; i < FTRACE_STACK_ENTRIES; i++) {
11101110
unsigned long ip = field->caller[i];
11111111

1112-
if (ip == ULONG_MAX || trace_seq_has_overflowed(s))
1112+
if (!ip || trace_seq_has_overflowed(s))
11131113
break;
11141114

11151115
trace_seq_puts(s, " => ");
1116-
1117-
if (!ip) {
1118-
trace_seq_puts(s, "??");
1119-
trace_seq_putc(s, '\n');
1120-
continue;
1121-
}
1122-
11231116
seq_print_user_ip(s, mm, ip, flags);
11241117
trace_seq_putc(s, '\n');
11251118
}

0 commit comments

Comments
 (0)