From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38789C43381 for ; Mon, 25 Feb 2019 21:20:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0814C21848 for ; Mon, 25 Feb 2019 21:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129640; bh=sMT19/qubTtS2iZN9A9+p1AJ/oQXsdlTeXE5gXrMzjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=g9FbSKTj6C1a0FnohXPk+c1cRq9zoiQEXfzN5GNZOEvFeOym/Y0GBZ1Cs8uWJxrm2 jGwhAKuyyAoF7tXO5Z8tUhikp/s02yXRI5MOH4UVXBtNomk/0VFuDZZ6ZSWJ6yuaPs 29SSdwLQp1EwpCBjhDv2dQKFKcpYk2a5pXAMi1Ng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730478AbfBYVUi (ORCPT ); Mon, 25 Feb 2019 16:20:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:53996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730467AbfBYVUe (ORCPT ); Mon, 25 Feb 2019 16:20:34 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 61D9E205C9; Mon, 25 Feb 2019 21:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129633; bh=sMT19/qubTtS2iZN9A9+p1AJ/oQXsdlTeXE5gXrMzjk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nf7Ma/II6JruwifQbCEoYDRfl137UQwdLaiA50fHU+pcBuFXJwTeJma1Z6Q8FsAAv p55q9JTKamBWQd06NwvGHCEGvMbT5zLFRNsXs9n96hqRis0zXEqjSWTtaFDaau3EMQ res4fpOmJsBVw487AivJ2dqmC1nV0GsfLTZrEgaQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Fernandes , Quentin Perret , "Steven Rostedt (VMware)" Subject: [PATCH 4.19 002/152] tracing: Fix number of entries in trace header Date: Mon, 25 Feb 2019 22:09:54 +0100 Message-Id: <20190225195043.827161290@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195043.645958524@linuxfoundation.org> References: <20190225195043.645958524@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Quentin Perret commit 9e7382153f80ba45a0bbcd540fb77d4b15f6e966 upstream. The following commit 441dae8f2f29 ("tracing: Add support for display of tgid in trace output") removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour. Link: http://lkml.kernel.org/r/20190214152950.4179-1-quentin.perret@arm.com Acked-by: Joel Fernandes Cc: stable@vger.kernel.org Fixes: 441dae8f2f29 ("tracing: Add support for display of tgid in trace output") Signed-off-by: Quentin Perret Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Greg Kroah-Hartman --- kernel/trace/trace.c | 2 ++ 1 file changed, 2 insertions(+) --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -3383,6 +3383,8 @@ static void print_func_help_header_irq(s const char tgid_space[] = " "; const char space[] = " "; + print_event_info(buf, m); + seq_printf(m, "# %s _-----=> irqs-off\n", tgid ? tgid_space : space); seq_printf(m, "# %s / _----=> need-resched\n",