From dfa8d20754389ed8d51ef3007ba968d194fa202c Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Sun, 22 Nov 2009 05:21:33 +0100 Subject: [PATCH] --- yaml --- r: 169731 b: refs/heads/master c: 28889bf9e2db29747d58cd47a92d727f927c3aee h: refs/heads/master i: 169729: 68816f8a1a5274ca16a0ebe27882dd6e95076762 169727: bee6342f96705e69683fca04ab71f30f4b2d8542 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_syscalls.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 5573f18bafbd..78f17cf57285 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce71b9df8893ec954e56c5979df6da274f20f65e +refs/heads/master: 28889bf9e2db29747d58cd47a92d727f927c3aee diff --git a/trunk/kernel/trace/trace_syscalls.c b/trunk/kernel/trace/trace_syscalls.c index 0bb934875263..41b6dd963daa 100644 --- a/trunk/kernel/trace/trace_syscalls.c +++ b/trunk/kernel/trace/trace_syscalls.c @@ -511,10 +511,7 @@ static void prof_syscall_enter(struct pt_regs *regs, long id) cpu = smp_processor_id(); - if (in_nmi()) - trace_buf = rcu_dereference(perf_trace_buf_nmi); - else - trace_buf = rcu_dereference(perf_trace_buf); + trace_buf = rcu_dereference(perf_trace_buf); if (!trace_buf) goto end; @@ -617,10 +614,7 @@ static void prof_syscall_exit(struct pt_regs *regs, long ret) cpu = smp_processor_id(); - if (in_nmi()) - trace_buf = rcu_dereference(perf_trace_buf_nmi); - else - trace_buf = rcu_dereference(perf_trace_buf); + trace_buf = rcu_dereference(perf_trace_buf); if (!trace_buf) goto end;