diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /kernel/trace/trace_event_profile.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'kernel/trace/trace_event_profile.c')
| -rw-r--r-- | kernel/trace/trace_event_profile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c index f0d693005075..c1cc3ab633de 100644 --- a/kernel/trace/trace_event_profile.c +++ b/kernel/trace/trace_event_profile.c | |||
| @@ -138,9 +138,9 @@ __kprobes void *ftrace_perf_buf_prepare(int size, unsigned short type, | |||
| 138 | cpu = smp_processor_id(); | 138 | cpu = smp_processor_id(); |
| 139 | 139 | ||
| 140 | if (in_nmi()) | 140 | if (in_nmi()) |
| 141 | trace_buf = rcu_dereference(perf_trace_buf_nmi); | 141 | trace_buf = rcu_dereference_sched(perf_trace_buf_nmi); |
| 142 | else | 142 | else |
| 143 | trace_buf = rcu_dereference(perf_trace_buf); | 143 | trace_buf = rcu_dereference_sched(perf_trace_buf); |
| 144 | 144 | ||
| 145 | if (!trace_buf) | 145 | if (!trace_buf) |
| 146 | goto err; | 146 | goto err; |