diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-23 11:10:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-23 11:10:03 +0100 |
| commit | 9b03638963e4b239dff1b424b91062a710d4b2e9 (patch) | |
| tree | 184bbcc7160c5d0e304166b1ecb190897e1f0afc /kernel/trace/trace.c | |
| parent | 03b30d151a918364c1c7d08bcb3e167be0a3746f (diff) | |
| parent | 69507c06539332e6e49f83aa478844130233bece (diff) | |
| download | talos-obmc-linux-9b03638963e4b239dff1b424b91062a710d4b2e9.tar.gz talos-obmc-linux-9b03638963e4b239dff1b424b91062a710d4b2e9.zip | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 220c264e3111..757ae6f7e648 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -415,7 +415,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu) ftrace_enable_cpu(); - WARN_ON_ONCE(ret); + WARN_ON_ONCE(ret && ret != -EAGAIN); __update_max_tr(tr, tsk, cpu); __raw_spin_unlock(&ftrace_max_lock); |
