diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 62776b71b1c5..dedf35f36971 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -948,9 +948,9 @@ static void ftrace_trace_userstack(struct trace_array *tr, | |||
948 | struct trace_array_cpu *data, | 948 | struct trace_array_cpu *data, |
949 | unsigned long flags, int pc) | 949 | unsigned long flags, int pc) |
950 | { | 950 | { |
951 | struct ring_buffer_event *event; | ||
951 | struct userstack_entry *entry; | 952 | struct userstack_entry *entry; |
952 | struct stack_trace trace; | 953 | struct stack_trace trace; |
953 | struct ring_buffer_event *event; | ||
954 | unsigned long irq_flags; | 954 | unsigned long irq_flags; |
955 | 955 | ||
956 | if (!(trace_flags & TRACE_ITER_USERSTACKTRACE)) | 956 | if (!(trace_flags & TRACE_ITER_USERSTACKTRACE)) |
@@ -1471,8 +1471,7 @@ static inline int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, | |||
1471 | if (file) { | 1471 | if (file) { |
1472 | ret = trace_seq_path(s, &file->f_path); | 1472 | ret = trace_seq_path(s, &file->f_path); |
1473 | if (ret) | 1473 | if (ret) |
1474 | ret = trace_seq_printf(s, "[+0x%lx]", | 1474 | ret = trace_seq_printf(s, "[+0x%lx]", ip - vmstart); |
1475 | ip - vmstart); | ||
1476 | } | 1475 | } |
1477 | if (ret && ((sym_flags & TRACE_ITER_SYM_ADDR) || !file)) | 1476 | if (ret && ((sym_flags & TRACE_ITER_SYM_ADDR) || !file)) |
1478 | ret = trace_seq_printf(s, " <" IP_FMT ">", ip); | 1477 | ret = trace_seq_printf(s, " <" IP_FMT ">", ip); |
@@ -1485,7 +1484,7 @@ seq_print_userip_objs(const struct userstack_entry *entry, struct trace_seq *s, | |||
1485 | { | 1484 | { |
1486 | struct mm_struct *mm = NULL; | 1485 | struct mm_struct *mm = NULL; |
1487 | int ret = 1; | 1486 | int ret = 1; |
1488 | unsigned i; | 1487 | unsigned int i; |
1489 | 1488 | ||
1490 | if (trace_flags & TRACE_ITER_SYM_USEROBJ) { | 1489 | if (trace_flags & TRACE_ITER_SYM_USEROBJ) { |
1491 | struct task_struct *task; | 1490 | struct task_struct *task; |