From b96d1f9c54b132d96152f4b6de92ad593fe8d880 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Sun, 27 Sep 2009 07:02:07 -0400 Subject: [PATCH] --- yaml --- r: 167091 b: refs/heads/master c: 829b876dfc94ea8be3a47e200d06f1f217bb104f h: refs/heads/master i: 167089: a7a1c65c0198f900151fcd87c8a46e0819959fac 167087: 78b948b4f76c895aeecc33090ef7425b6a548832 v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_output.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a0e0b4b21f94..481570a5b8cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 +refs/heads/master: 829b876dfc94ea8be3a47e200d06f1f217bb104f diff --git a/trunk/kernel/trace/trace_output.c b/trunk/kernel/trace/trace_output.c index cda766f9f421..ed17565826b0 100644 --- a/trunk/kernel/trace/trace_output.c +++ b/trunk/kernel/trace/trace_output.c @@ -486,16 +486,18 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry) hardirq ? 'h' : softirq ? 's' : '.')) return 0; - if (entry->lock_depth < 0) - ret = trace_seq_putc(s, '.'); + if (entry->preempt_count) + ret = trace_seq_printf(s, "%x", entry->preempt_count); else - ret = trace_seq_printf(s, "%d", entry->lock_depth); + ret = trace_seq_putc(s, '.'); + if (!ret) return 0; - if (entry->preempt_count) - return trace_seq_printf(s, "%x", entry->preempt_count); - return trace_seq_putc(s, '.'); + if (entry->lock_depth < 0) + return trace_seq_putc(s, '.'); + + return trace_seq_printf(s, "%d", entry->lock_depth); } static int