diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-21 11:49:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-21 11:49:37 +0200 |
| commit | 5c65ca75209de8cc1802e7d3761b404957689cda (patch) | |
| tree | 63dbd61c004b5785df56fc224717eb7bc8219f6b | |
| parent | c7a3a88c938fbe3d70c2278e082b80eb830d1c58 (diff) | |
| parent | 60916a9382e88fbf5e54fd36a3e658efd7ab7bed (diff) | |
| download | op-kernel-dev-5c65ca75209de8cc1802e7d3761b404957689cda.zip op-kernel-dev-5c65ca75209de8cc1802e7d3761b404957689cda.tar.gz | |
Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull syscall tracing fix from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | kernel/trace/trace_syscalls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c index 60e4d78..6b245f64 100644 --- a/kernel/trace/trace_syscalls.c +++ b/kernel/trace/trace_syscalls.c @@ -506,6 +506,8 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id) int size; syscall_nr = syscall_get_nr(current, regs); + if (syscall_nr < 0) + return; if (!test_bit(syscall_nr, enabled_perf_enter_syscalls)) return; @@ -580,6 +582,8 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret) int size; syscall_nr = syscall_get_nr(current, regs); + if (syscall_nr < 0) + return; if (!test_bit(syscall_nr, enabled_perf_exit_syscalls)) return; |
