---

yaml --- r: 263646 b: refs/heads/master c: 20afc60 h: refs/heads/master v: v3
git-mirror · Aug 31, 2011 · 1d11526 · 1d11526
1 parent f7eb6d7
commit 1d11526
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f310a5d4e8525ac0cc2f58c973d2100ce034410
+refs/heads/master: 20afc60f892d285fde179ead4b24e6a7938c2f1b
diff --git a/trunk/arch/x86/kernel/cpu/perf_event.c b/trunk/arch/x86/kernel/cpu/perf_event.c
@@ -1900,6 +1900,9 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
 
 	perf_callchain_store(entry, regs->ip);
 
+	if (!current->mm)
+		return;
+
 	if (perf_callchain_user32(regs, entry))
 		return;
-Original file line number
+Diff line change
@@ Expand Up @@
     	perf_callchain_store(entry, regs->ip);
+    	if (!current->mm)
+    		return;
     	if (perf_callchain_user32(regs, entry))
     		return;
@@ Expand Down @@