diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /arch/x86/kernel | |
| parent | 4722cd7741c6404f967f7a7b8b666540b6c1663e (diff) | |
| parent | 08aab447c56a5388cf0c768da476ad022f00fef8 (diff) | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index 4ee3abf20ed6..cfa62ec090ec 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1900,6 +1900,9 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs) | |||
| 1900 | 1900 | ||
| 1901 | perf_callchain_store(entry, regs->ip); | 1901 | perf_callchain_store(entry, regs->ip); |
| 1902 | 1902 | ||
| 1903 | if (!current->mm) | ||
| 1904 | return; | ||
| 1905 | |||
| 1903 | if (perf_callchain_user32(regs, entry)) | 1906 | if (perf_callchain_user32(regs, entry)) |
| 1904 | return; | 1907 | return; |
| 1905 | 1908 | ||