aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Weisbecker <fweisbec@gmail.com>2009-11-21 23:21:33 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-22 03:03:42 -0500
commit28889bf9e2db29747d58cd47a92d727f927c3aee (patch)
tree7c5e0edd6e669ce0e3ab8a01fb6b381001bf1552
parentce71b9df8893ec954e56c5979df6da274f20f65e (diff)
tracing: Forget about the NMI buffer for syscall events
We are never in an NMI context when we commit a syscall trace to perf. So just forget about the nmi buffer there. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Jason Baron <jbaron@redhat.com> LKML-Reference: <1258863695-10464-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/trace/trace_syscalls.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 0bb934875263..41b6dd963daa 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -511,10 +511,7 @@ static void prof_syscall_enter(struct pt_regs *regs, long id)
511 511
512 cpu = smp_processor_id(); 512 cpu = smp_processor_id();
513 513
514 if (in_nmi()) 514 trace_buf = rcu_dereference(perf_trace_buf);
515 trace_buf = rcu_dereference(perf_trace_buf_nmi);
516 else
517 trace_buf = rcu_dereference(perf_trace_buf);
518 515
519 if (!trace_buf) 516 if (!trace_buf)
520 goto end; 517 goto end;
@@ -617,10 +614,7 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret)
617 614
618 cpu = smp_processor_id(); 615 cpu = smp_processor_id();
619 616
620 if (in_nmi()) 617 trace_buf = rcu_dereference(perf_trace_buf);
621 trace_buf = rcu_dereference(perf_trace_buf_nmi);
622 else
623 trace_buf = rcu_dereference(perf_trace_buf);
624 618
625 if (!trace_buf) 619 if (!trace_buf)
626 goto end; 620 goto end;