From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758289AbbKSKMu (ORCPT ); Thu, 19 Nov 2015 05:12:50 -0500 Received: from terminus.zytor.com ([198.137.202.10]:39615 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758146AbbKSKMr (ORCPT ); Thu, 19 Nov 2015 05:12:47 -0500 Date: Thu, 19 Nov 2015 02:12:31 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: rostedt@goodmis.org, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, hpa@linux.intel.com, hpa@zytor.com, mingo@kernel.org Reply-To: hpa@zytor.com, mingo@kernel.org, rostedt@goodmis.org, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, hpa@linux.intel.com In-Reply-To: <1447721004-2551-1-git-send-email-namhyung@kernel.org> References: <1447721004-2551-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/ftrace: Add comment on static function tracing Git-Commit-ID: 112677d683d31ebd6a8e8b02e0620ae512354b2d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 112677d683d31ebd6a8e8b02e0620ae512354b2d Gitweb: http://git.kernel.org/tip/112677d683d31ebd6a8e8b02e0620ae512354b2d Author: Namhyung Kim AuthorDate: Tue, 17 Nov 2015 09:43:24 +0900 Committer: Thomas Gleixner CommitDate: Thu, 19 Nov 2015 11:07:49 +0100 x86/ftrace: Add comment on static function tracing 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 Signed-off-by: Namhyung Kim Cc: H. Peter Anvin Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1447721004-2551-1-git-send-email-namhyung@kernel.org Signed-off-by: Thomas Gleixner --- 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 94ea120..87e1762 100644 --- a/arch/x86/kernel/mcount_64.S +++ b/arch/x86/kernel/mcount_64.S @@ -278,6 +278,12 @@ trace: /* 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