aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 15:21:00 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 15:50:50 -0400
commitafc2abc0ae4265730a0fc48618012193a09a1d10 (patch)
tree1ae91505e067f63e9a7d02d3a3af731af59abee1 /kernel/trace
parent93dcc6ea096c51cc30ad0f6647ed05fead2439bf (diff)
ftrace: cleanups
no code changed. Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 627e39936ea7..d6b60576f991 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1155,12 +1155,12 @@ lat_print_generic(struct trace_seq *s, struct trace_entry *entry, int cpu)
1155 1155
1156 hardirq = entry->flags & TRACE_FLAG_HARDIRQ; 1156 hardirq = entry->flags & TRACE_FLAG_HARDIRQ;
1157 softirq = entry->flags & TRACE_FLAG_SOFTIRQ; 1157 softirq = entry->flags & TRACE_FLAG_SOFTIRQ;
1158 if (hardirq && softirq) 1158 if (hardirq && softirq) {
1159 trace_seq_putc(s, 'H'); 1159 trace_seq_putc(s, 'H');
1160 else { 1160 } else {
1161 if (hardirq) 1161 if (hardirq) {
1162 trace_seq_putc(s, 'h'); 1162 trace_seq_putc(s, 'h');
1163 else { 1163 } else {
1164 if (softirq) 1164 if (softirq)
1165 trace_seq_putc(s, 's'); 1165 trace_seq_putc(s, 's');
1166 else 1166 else
@@ -2177,8 +2177,7 @@ tracing_poll_pipe(struct file *filp, poll_table *poll_table)
2177 * Always select as readable when in blocking mode 2177 * Always select as readable when in blocking mode
2178 */ 2178 */
2179 return POLLIN | POLLRDNORM; 2179 return POLLIN | POLLRDNORM;
2180 } 2180 } else {
2181 else {
2182 if (!trace_empty(iter)) 2181 if (!trace_empty(iter))
2183 return POLLIN | POLLRDNORM; 2182 return POLLIN | POLLRDNORM;
2184 poll_wait(filp, &trace_wait, poll_table); 2183 poll_wait(filp, &trace_wait, poll_table);