---

yaml --- r: 121191 b: refs/heads/master c: e38da59 h: refs/heads/master i: 121189: 591a18d 121187: ab52367 121183: 36c8940 v: v3
git-mirror · Nov 23, 2008 · d308b34 · d308b34
1 parent fa6a8bf
commit d308b34
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d26487fd4ddda7a0237da418fb8669fb06ae557
+refs/heads/master: e38da59269be8c0196d16dff1be5bb26076afc6a
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -1470,13 +1470,13 @@ static inline int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm,
 			file = vma->vm_file;
 			vmstart = vma->vm_start;
 		}
+		if (file) {
+			ret = trace_seq_path(s, &file->f_path);
+			if (ret)
+				ret = trace_seq_printf(s, "[+0x%lx]", ip - vmstart);
+		}
 		up_read(&mm->mmap_sem);
 	}
-	if (file) {
-		ret = trace_seq_path(s, &file->f_path);
-		if (ret)
-			ret = trace_seq_printf(s, "[+0x%lx]", ip - vmstart);
-	}
 	if (ret && ((sym_flags & TRACE_ITER_SYM_ADDR) || !file))
 		ret = trace_seq_printf(s, " <" IP_FMT ">", ip);
 	return ret;