Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932405AbcJPPUn (ORCPT ); Sun, 16 Oct 2016 11:20:43 -0400 Received: from userp1050.oracle.com ([156.151.31.82]:45935 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755694AbcJPPUZ (ORCPT ); Sun, 16 Oct 2016 11:20:25 -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 07/12] tracing: declare __{start,stop}_ftrace_enum_maps as external array Date: Sun, 16 Oct 2016 17:16:11 +0200 Message-Id: <20161016151616.31451-8-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: userp1040.oracle.com [156.151.31.81] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1162 Lines: 39 Cc: Steven Rostedt Signed-off-by: Vegard Nossum --- kernel/trace/trace.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 8696ce6..d1bee81 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -11,6 +11,7 @@ * Copyright (C) 2004-2006 Ingo Molnar * Copyright (C) 2004 Nadia Yvette Chambers */ +#include #include #include #include @@ -7299,15 +7300,12 @@ struct dentry *tracing_init_dentry(void) return NULL; } -extern struct trace_enum_map *__start_ftrace_enum_maps[]; -extern struct trace_enum_map *__stop_ftrace_enum_maps[]; +DECLARE_EXTARRAY(struct trace_enum_map *, ftrace_enum_maps); static void __init trace_enum_init(void) { - int len; - - len = __stop_ftrace_enum_maps - __start_ftrace_enum_maps; - trace_insert_enum_map(NULL, __start_ftrace_enum_maps, len); + trace_insert_enum_map(NULL, ext_start(ftrace_enum_maps), + ext_size(ftrace_enum_maps)); } #ifdef CONFIG_MODULES -- 2.10.0.479.g221bd91