From 43ea6b6f20df1c7769e972bf42a3c917cfd0087f Mon Sep 17 00:00:00 2001 From: Liu Bo Date: Mon, 14 Jan 2013 10:54:11 +0800 Subject: [PATCH] --- yaml --- r: 348808 b: refs/heads/master c: 250bfd3d8e7e19cb649dd94689f0af2ce3474060 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 533d4cd8eb93..8a9ff63a71e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2df8f8a6a897ebf4c5613b5be6103d33b2a21520 +refs/heads/master: 250bfd3d8e7e19cb649dd94689f0af2ce3474060 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index f3ec1cfb0de1..3c13e46d7d24 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3454,7 +3454,7 @@ static int tracing_wait_pipe(struct file *filp) return -EINTR; /* - * We block until we read something and tracing is enabled. + * We block until we read something and tracing is disabled. * We still block if tracing is disabled, but we have never * read anything. This allows a user to cat this file, and * then enable tracing. But after we have read something, @@ -3462,7 +3462,7 @@ static int tracing_wait_pipe(struct file *filp) * * iter->pos will be 0 if we haven't read anything. */ - if (tracing_is_enabled() && iter->pos) + if (!tracing_is_enabled() && iter->pos) break; }