---

yaml --- r: 167091 b: refs/heads/master c: 829b876 h: refs/heads/master i: 167089: a7a1c65 167087: 78b948b v: v3
git-mirror · Oct 7, 2009 · b96d1f9 · b96d1f9
1 parent 54aa89e
commit b96d1f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git 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
@@ -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