From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756809AbcJPPRi (ORCPT ); Sun, 16 Oct 2016 11:17:38 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:48000 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756493AbcJPPRL (ORCPT ); Sun, 16 Oct 2016 11:17:11 -0400 From: Vegard Nossum To: linux-kernel@vger.kernel.org, Greg Kroah-Hartman Cc: Jiri Slaby , Linus Torvalds , "Luis R . Rodriguez" , Vegard Nossum , Steven Rostedt Subject: [PATCH 03/12] ftrace: declare __{start,stop}_mcount_loc as external array Date: Sun, 16 Oct 2016 17:16:07 +0200 Message-Id: <20161016151616.31451-4-vegard.nossum@oracle.com> X-Mailer: git-send-email 2.10.0.479.g221bd91 In-Reply-To: <20161016151616.31451-1-vegard.nossum@oracle.com> References: <20161016151616.31451-1-vegard.nossum@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Cc: Steven Rostedt Signed-off-by: Vegard Nossum --- kernel/trace/ftrace.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 2050a765..3c37036 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -13,6 +13,7 @@ * Copyright (C) 2004 Nadia Yvette Chambers */ +#include #include #include #include @@ -5075,10 +5076,10 @@ void ftrace_module_init(struct module *mod) } #endif /* CONFIG_MODULES */ +DECLARE_EXTARRAY(unsigned long, mcount_loc); + void __init ftrace_init(void) { - extern unsigned long __start_mcount_loc[]; - extern unsigned long __stop_mcount_loc[]; unsigned long count, flags; int ret; @@ -5088,7 +5089,7 @@ void __init ftrace_init(void) if (ret) goto failed; - count = __stop_mcount_loc - __start_mcount_loc; + count = ext_size(mcount_loc); if (!count) { pr_info("ftrace: No functions to be traced?\n"); goto failed; @@ -5100,8 +5101,8 @@ void __init ftrace_init(void) last_ftrace_enabled = ftrace_enabled = 1; ret = ftrace_process_locs(NULL, - __start_mcount_loc, - __stop_mcount_loc); + ext_start(mcount_loc), + ext_end(mcount_loc)); set_ftrace_early_filters(); -- 2.10.0.479.g221bd91