Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757197AbZJFMub (ORCPT ); Tue, 6 Oct 2009 08:50:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757185AbZJFMub (ORCPT ); Tue, 6 Oct 2009 08:50:31 -0400 Received: from hera.kernel.org ([140.211.167.34]:60813 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757182AbZJFMua (ORCPT ); Tue, 6 Oct 2009 08:50:30 -0400 Date: Tue, 6 Oct 2009 12:49:15 GMT From: tip-bot for Hiroshi Shimamoto Cc: linux-kernel@vger.kernel.org, h-shimamoto@ct.jp.nec.com, hpa@zytor.com, mingo@redhat.com, fweisbec@gmail.com, srostedt@redhat.com, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, h-shimamoto@ct.jp.nec.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, srostedt@redhat.com, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <4AC43118.6050409@ct.jp.nec.com> References: <4AC43118.6050409@ct.jp.nec.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:tracing/urgent] trace: Fix missing assignment in trace_ctxwake_* Message-ID: Git-Commit-ID: b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Tue, 06 Oct 2009 12:49:16 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2105 Lines: 55 Commit-ID: b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 Gitweb: http://git.kernel.org/tip/b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 Author: Hiroshi Shimamoto AuthorDate: Thu, 1 Oct 2009 13:33:28 +0900 Committer: Ingo Molnar CommitDate: Tue, 6 Oct 2009 14:28:24 +0200 trace: Fix missing assignment in trace_ctxwake_* The state char variable S should be reassigned, if S == 0. We are missing the state of the task that is going to sleep for the context switch events (in the raw mode). Fortunately the problem arises with the sched_switch/wake_up tracers, not the sched trace events. The formers are legacy now. But still, that was buggy. Signed-off-by: Hiroshi Shimamoto Cc: Steven Rostedt Acked-by: Frederic Weisbecker LKML-Reference: <4AC43118.6050409@ct.jp.nec.com> Signed-off-by: Ingo Molnar --- kernel/trace/trace_output.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index f572f44..cda766f 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -883,7 +883,7 @@ static int trace_ctxwake_raw(struct trace_iterator *iter, char S) trace_assign_type(field, iter->ent); if (!S) - task_state_char(field->prev_state); + S = task_state_char(field->prev_state); T = task_state_char(field->next_state); if (!trace_seq_printf(&iter->seq, "%d %d %c %d %d %d %c\n", field->prev_pid, @@ -918,7 +918,7 @@ static int trace_ctxwake_hex(struct trace_iterator *iter, char S) trace_assign_type(field, iter->ent); if (!S) - task_state_char(field->prev_state); + S = task_state_char(field->prev_state); T = task_state_char(field->next_state); SEQ_PUT_HEX_FIELD_RET(s, field->prev_pid); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/