From patchwork Wed Jun 14 22:27:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 105596 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp512070qgd; Wed, 14 Jun 2017 15:27:42 -0700 (PDT) X-Received: by 10.98.100.8 with SMTP id y8mr2036713pfb.79.1497479262245; Wed, 14 Jun 2017 15:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497479262; cv=none; d=google.com; s=arc-20160816; b=qvGAWBS1CNX0Tsyv6PtP9796cLMbrvhoTCa7FWrYpSj1HPWByyx5YO0TV0jJg8Ucjd q9qlasOTdmLp3cSOgoLJceARF9VEUNeG1iH1fjgn9CvvO0T/77rZQYpFTI48DBAZz7m+ 5bKYvP3EWNIcxBzLddYBUNQEGm6Lvo3uhsCitzQ55HwH5PoAkwf2LWZGN+l4jjk0qmYt Tw4m+iNvvB20u86JhvZuNOAs+6PjUXOZbsCtasRtqxaSseprs0U5PfKcjTmndflKk9xl YB77R2GJIh1dfjtIN0Iwi3lX62+NL3W6gPTfV6MycDKZqhmv9XZBcCBZJjnpHPgChrM+ 8/3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=oCEgMugLNIk1eHaGkIS0Lwx1isnVLJsNkI05RlFckDw=; b=jf0wO8ratXf9wGPD2s6WtMaFoGLkpN8/3E8iBTVcesTJ+yM6LW3awpjz9cWn7SDAg0 W2MhJ5eCYgV2edhRxa9TLDiZzPXbENYp8skBxUTwTy8eOh8mvAZOPkJJXo3aOoU0SoH0 TYrYlsXKOqdwhzfwVgw6flL4y3i94yF7gW4pyMQiGSY30/w+VtxTnZjOX8fr01Y5W2T6 C6NkzA8twt7stnQhxOMM8V0bLMTvSf82GzWo+aB1JivrChOf1OkWG/ggqj9y7XVlwrCZ qZHxlRPkf4krYajrYcjl1ynzf+9mkvUEmsSO9NK1u9la1it+ZFUKwb9WJiE51hzpWqSR sdtg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 33si886660plh.539.2017.06.14.15.27.41; Wed, 14 Jun 2017 15:27:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752681AbdFNW1g (ORCPT + 25 others); Wed, 14 Jun 2017 18:27:36 -0400 Received: from foss.arm.com ([217.140.101.70]:39566 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752080AbdFNW1b (ORCPT ); Wed, 14 Jun 2017 18:27:31 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5D3CC15A2; Wed, 14 Jun 2017 15:27:31 -0700 (PDT) Received: from beelzebub.ast.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C89883F3E1; Wed, 14 Jun 2017 15:27:30 -0700 (PDT) From: Jeremy Linton To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, rostedt@goodmis.org, mingo@redhat.com, rusty@rustcorp.com.au, jeyu@redhat.com, kirill.shutemov@linux.intel.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, jcm@jonmasters.org, clemens@ladisch.de, perex@perex.cz Subject: [PATCH v2 01/13] trace: rename kernel enum section to eval Date: Wed, 14 Jun 2017 17:27:17 -0500 Message-Id: <20170614222729.16521-2-jeremy.linton@arm.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614222729.16521-1-jeremy.linton@arm.com> References: <20170614222729.16521-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kernel and its modules have sections containing the enum string to value conversions. Rename this section because we intend to store more than enums in it. Signed-off-by: Jeremy Linton --- include/asm-generic/vmlinux.lds.h | 6 +++--- include/trace/trace_events.h | 2 +- kernel/module.c | 2 +- kernel/trace/trace.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) -- 2.9.4 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 314a0b9..800f9f9 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -125,9 +125,9 @@ VMLINUX_SYMBOL(__start_ftrace_events) = .; \ KEEP(*(_ftrace_events)) \ VMLINUX_SYMBOL(__stop_ftrace_events) = .; \ - VMLINUX_SYMBOL(__start_ftrace_enum_maps) = .; \ - KEEP(*(_ftrace_enum_map)) \ - VMLINUX_SYMBOL(__stop_ftrace_enum_maps) = .; + VMLINUX_SYMBOL(__start_ftrace_eval_maps) = .; \ + KEEP(*(_ftrace_eval_map)) \ + VMLINUX_SYMBOL(__stop_ftrace_eval_maps) = .; #else #define FTRACE_EVENTS() #endif diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index 00f6431..4bdd840 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -43,7 +43,7 @@ TRACE_MAKE_SYSTEM_STR(); .enum_value = a \ }; \ static struct trace_enum_map __used \ - __attribute__((section("_ftrace_enum_map"))) \ + __attribute__((section("_ftrace_eval_map"))) \ *TRACE_SYSTEM##_##a = &__##TRACE_SYSTEM##_##a /* diff --git a/kernel/module.c b/kernel/module.c index 4a3665f..9ec4713 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3077,7 +3077,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) mod->trace_events = section_objs(info, "_ftrace_events", sizeof(*mod->trace_events), &mod->num_trace_events); - mod->trace_enums = section_objs(info, "_ftrace_enum_map", + mod->trace_enums = section_objs(info, "_ftrace_eval_map", sizeof(*mod->trace_enums), &mod->num_trace_enums); #endif diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c4536c4..ce564c2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7704,15 +7704,15 @@ 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[]; +extern struct trace_enum_map *__start_ftrace_eval_maps[]; +extern struct trace_enum_map *__stop_ftrace_eval_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); + len = __stop_ftrace_eval_maps - __start_ftrace_eval_maps; + trace_insert_enum_map(NULL, __start_ftrace_eval_maps, len); } #ifdef CONFIG_MODULES