Merge commit 'v3.1-rc7' into perf/core

Merge reason: Pick up the latest upstream fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-09-26 12:53:42 +02:00
parent cba9bd22a5 d93dc5c447
commit ed3982cf37
870 changed files with 9655 additions and 5241 deletions
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1908,6 +1908,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;