From patchwork Wed Jun 14 22:27:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 105607 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp512836qgd; Wed, 14 Jun 2017 15:30:08 -0700 (PDT) X-Received: by 10.84.232.206 with SMTP id x14mr2504148plm.7.1497479408033; Wed, 14 Jun 2017 15:30:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497479408; cv=none; d=google.com; s=arc-20160816; b=jrbru2oEqz6k95RhXl/OPo0f2eXMM4s+X4IrFmZhwk19XFY/nBkxQQxOX8NMhKMt6V CyigV3ZwUKhwYWku28v76i2+nje52hTZFBck3yaMOS6pjL7DNved2xd7sKn8u5jE15y7 GFJ1kRS69sYBq/mYXIgVQa2tND0SNFJVfRH02ptfKUUF3OxHMo1IxRXoWTOxYYr9GB+2 W3XXHQnVPKpLDmtWHJF8C+aHJTBRbi3J24KoJp+zonb9p5rKfww/GU287VV1Gs/3HUdw Hfwm+TaiaAmaB4XLBFg02vyWl2pqJa5AoMjiIEGrwE5LAVdgxLyoc8IYXHq64hlbUfvQ /RPQ== 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=RRVnIQsYIjdFHGS0wEeeYfxZkpIKrjKqlONnhU/OCLM=; b=IIcd8AxLX+Kf6rTk0HjzhKDbHLn4O8ofV+zOw25P77lLKOi2WUtFCjl5r8icddnIts /bHNqyaFypmCa1xsEyxzwxE/I2RFk0hQELrxMoFAOhg9KbFWCVGlRWByFIOtRoPk0UNF GwV090TkHMZi0mpZDc1vnXOhn/aprJCt+nUw2c2AD17cT4fNgMb4PSvnQcKviM0/9c2+ tfxD+wMDd7v+LPE5+Rp7VWa3+03XWTMMs7RVIeaRZ6Hi07eW6/TcdssJuILEgxO6ZVpu PikTOEjDmeR/cn2DADqAI7CrK8tAYlHVoMadzPTY+8vGzXBQz+0FSqY3fS3VNrwGPYN8 K8lQ== 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 v4si854093plk.237.2017.06.14.15.30.07; Wed, 14 Jun 2017 15:30:08 -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 S1753065AbdFNWaA (ORCPT + 25 others); Wed, 14 Jun 2017 18:30:00 -0400 Received: from foss.arm.com ([217.140.101.70]:39610 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752546AbdFNW1d (ORCPT ); Wed, 14 Jun 2017 18:27:33 -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 8B11B15BF; Wed, 14 Jun 2017 15:27:32 -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 02E393F3E1; Wed, 14 Jun 2017 15:27:31 -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 03/13] trace: rename struct module entry for trace enums Date: Wed, 14 Jun 2017 17:27:19 -0500 Message-Id: <20170614222729.16521-4-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 Each module has a list of enum's its contributing to the enum map, rename that entry to reflect its use by more than enums. Signed-off-by: Jeremy Linton --- include/linux/module.h | 4 ++-- kernel/module.c | 6 +++--- kernel/trace/trace.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.9.4 diff --git a/include/linux/module.h b/include/linux/module.h index 46b4804..8eb9a1e 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -442,8 +442,8 @@ struct module { #ifdef CONFIG_EVENT_TRACING struct trace_event_call **trace_events; unsigned int num_trace_events; - struct trace_eval_map **trace_enums; - unsigned int num_trace_enums; + struct trace_eval_map **trace_evals; + unsigned int num_trace_evals; #endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD unsigned int num_ftrace_callsites; diff --git a/kernel/module.c b/kernel/module.c index 9ec4713..df1c4a9 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -3077,9 +3077,9 @@ 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_eval_map", - sizeof(*mod->trace_enums), - &mod->num_trace_enums); + mod->trace_evals = section_objs(info, "_ftrace_eval_map", + sizeof(*mod->trace_evals), + &mod->num_trace_evals); #endif #ifdef CONFIG_TRACING mod->trace_bprintk_fmt_start = section_objs(info, "__trace_printk_fmt", diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index f82764b..85f0e3c 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7718,7 +7718,7 @@ static void __init trace_enum_init(void) #ifdef CONFIG_MODULES static void trace_module_add_enums(struct module *mod) { - if (!mod->num_trace_enums) + if (!mod->num_trace_evals) return; /* @@ -7728,7 +7728,7 @@ static void trace_module_add_enums(struct module *mod) if (trace_module_has_bad_taint(mod)) return; - trace_insert_enum_map(mod, mod->trace_enums, mod->num_trace_enums); + trace_insert_enum_map(mod, mod->trace_evals, mod->num_trace_evals); } #ifdef CONFIG_TRACE_ENUM_MAP_FILE @@ -7737,7 +7737,7 @@ static void trace_module_remove_enums(struct module *mod) union trace_enum_map_item *map; union trace_enum_map_item **last = &trace_enum_maps; - if (!mod->num_trace_enums) + if (!mod->num_trace_evals) return; mutex_lock(&trace_enum_mutex);