From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754749AbZCVOU5 (ORCPT ); Sun, 22 Mar 2009 10:20:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754391AbZCVOUf (ORCPT ); Sun, 22 Mar 2009 10:20:35 -0400 Received: from hera.kernel.org ([140.211.167.34]:44897 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754131AbZCVOUe (ORCPT ); Sun, 22 Mar 2009 10:20:34 -0400 Date: Sun, 22 Mar 2009 14:19:55 GMT From: Frederic Weisbecker To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <1237694675-23509-1-git-send-email-fweisbec@gmail.com> References: <1237694675-23509-1-git-send-email-fweisbec@gmail.com> Subject: [tip:tracing/ftrace] tracing: keep the tracing buffer after self-test failure Message-ID: Git-Commit-ID: 0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 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]); Sun, 22 Mar 2009 14:19:57 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 Gitweb: http://git.kernel.org/tip/0cf53ff62b3e9e491ff5e5f05b193fb6ce643047 Author: Frederic Weisbecker AuthorDate: Sun, 22 Mar 2009 15:13:07 +0100 Committer: Ingo Molnar CommitDate: Sun, 22 Mar 2009 15:17:21 +0100 tracing: keep the tracing buffer after self-test failure Instead of using ftrace_dump_on_oops, it's far more convenient to have the trace leading up to a self-test failure available in /debug/tracing/trace. Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <1237694675-23509-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar --- kernel/trace/trace_selftest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index b56dcf7..08f4eb2 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -299,7 +299,7 @@ trace_selftest_startup_function_graph(struct tracer *trace, /* Have we just recovered from a hang? */ if (graph_hang_thresh > GRAPH_MAX_FUNC_TEST) { - trace->reset(tr); + tracing_selftest_disabled = true; ret = -1; goto out; }