From d308b34bfecefccea6689b8eaf570b3a6ab00ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B6r=C3=B6k=20Edwin?= <edwintorok@gmail.com>
Date: Sun, 23 Nov 2008 13:08:10 +0200
Subject: [PATCH] --- yaml --- r: 121191 b: refs/heads/master c:
 e38da59269be8c0196d16dff1be5bb26076afc6a h: refs/heads/master i:   121189:
 591a18db7f56cc48c867594fb5981bbb6b008a9e   121187:
 ab5236783b630aedb74aed63b63eee2581471417   121183:
 36c894015587cbb37d3a862f902d9878f38884b4 v: v3

---
 [refs]                     |  2 +-
 trunk/kernel/trace/trace.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index eb20c36102c8..ab60e92d7b5f 100644
--- 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
index 4c3bd82cec49..48d1536f1ca4 100644
--- 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;