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,URIBL_BLOCKED,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 D3DADC43381 for ; Mon, 25 Feb 2019 21:16:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A32FE217F9 for ; Mon, 25 Feb 2019 21:16:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129408; bh=ClTvmH33/CBVtxroZ/x656psD3N4d7yNP/WNOESo5AA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=p5JKK1CH56+36zmxFoNv6hLHkgVKn2Fi6ATrMMhAz8ZtDcRUNNdRV6s4WlWL9BJul l5MiMvuifZ85jS2xRw3xQKDPUmWbF+8LLf3vsLSzKmVearvSS6fNfSU0NnPOz9kpFR bX35VVfw3WU5gSEDT52DicyvNvwIMyVVgnPGGtZM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729795AbfBYVQq (ORCPT ); Mon, 25 Feb 2019 16:16:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:48526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729336AbfBYVQn (ORCPT ); Mon, 25 Feb 2019 16:16:43 -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 B9DDF217F4; Mon, 25 Feb 2019 21:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551129402; bh=ClTvmH33/CBVtxroZ/x656psD3N4d7yNP/WNOESo5AA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0I1P1voKD/6Jigshx/ThMrrDZcbsfHtDtiUrzyvLDC1AWarNTRh8lt5xHf/mgKg6g EvUDZ710GeJG7zcShro/b7vyktypuINXcz9sYP31K5CVNbTAxcVznCsPH9NSvX8GDN Kkn5kLmEV26Uftnrw79YuYjDgcXAHI5urX7VErX0= 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.14 02/71] tracing: Fix number of entries in trace header Date: Mon, 25 Feb 2019 22:11:04 +0100 Message-Id: <20190225195034.742252222@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195034.555044862@linuxfoundation.org> References: <20190225195034.555044862@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.14-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 @@ -3381,6 +3381,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",