From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752515AbbKQCDi (ORCPT ); Mon, 16 Nov 2015 21:03:38 -0500 Received: from smtprelay0028.hostedemail.com ([216.40.44.28]:52100 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751350AbbKQCDh (ORCPT ); Mon, 16 Nov 2015 21:03:37 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3352:3622:3865:3868:3870:3871:5007:6261:7875:8660:9010:10004:10400:10848:10967:11026:11232:11473:11658:11914:12296:12438:12517:12519:12555:12740:13069:13148:13230:13311:13357:14096:14097:14659:21080:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:2,LUA_SUMMARY:none X-HE-Tag: fear33_76af868441f3f X-Filterd-Recvd-Size: 2129 Date: Mon, 16 Nov 2015 21:03:33 -0500 From: Steven Rostedt To: Namhyung Kim Cc: x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , LKML Subject: Re: [PATCH] ftrace/x86: Add comment on static function tracing Message-ID: <20151116210333.49fec8de@grimm.local.home> In-Reply-To: <1447721004-2551-1-git-send-email-namhyung@kernel.org> References: <1447721004-2551-1-git-send-email-namhyung@kernel.org> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 17 Nov 2015 09:43:24 +0900 Namhyung Kim wrote: > There was a confusion between update_ftrace_function() and static > function tracing trampoline regarding 3rd parameter (ftrace_ops). > Add a comment for clarification. > > Suggested-by: Steven Rostedt Acked-by: Steven Rostedt -- Steve > Signed-off-by: Namhyung Kim > --- > arch/x86/kernel/mcount_64.S | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S > index 94ea120fa21f..87e1762e2bca 100644 > --- a/arch/x86/kernel/mcount_64.S > +++ b/arch/x86/kernel/mcount_64.S > @@ -278,6 +278,12 @@ GLOBAL(ftrace_stub) > /* save_mcount_regs fills in first two parameters */ > save_mcount_regs > > + /* > + * When DYNAMIC_FTRACE is not defined, ARCH_SUPPORTS_FTRACE_OPS is not > + * set (see include/asm/ftrace.h and include/linux/ftrace.h). Only the > + * ip and parent ip are used and the list function is called when > + * function tracing is enabled. > + */ > call *ftrace_trace_function > > restore_mcount_regs