From patchwork Thu Jun 15 10:52:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 105638 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp741131qgd; Thu, 15 Jun 2017 03:55:12 -0700 (PDT) X-Received: by 10.101.70.193 with SMTP id n1mr4739519pgr.249.1497524111914; Thu, 15 Jun 2017 03:55:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497524111; cv=none; d=google.com; s=arc-20160816; b=mLiAzir9D5XUX5V+Yw+DoLDiBM2E+U5SqlRabR5Jkt3ahxSA/KIzSpAIzyAd75Vc1t I8UDG6EZyGXj825cyF+TD1B92BzEnx+xuojawl0vNMKl8CiRmGccsSK3yFPMve6DmuYy v4qx2T3JsLNEGkKkDD+ikA+sKCVSJvc4FKuIaR+z1Wri71//wdaqwNFeWszq0Zgpn7kf 2FQnsf/UlzcuDGnUlpobHTFI4G41b27dcWXOawA2Hv58PE9sidciY7zxnQgxEfvs8r7W 8SlwneUa6RMi0ZLSW5ekh4B/JuWVTGIJGcLIqOaHZRM5aBQaQXlMcHNL8LvvUXr3rH9H o6aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:mime-version :references:subject:cc:to:from:date:user-agent:message-id :dmarc-filter:arc-authentication-results; bh=YZWWKtm2XWf1shpgkRabxRr1UJw4+yCbGThDHrQG+XI=; b=ozV/cqnXZHsB77MQpA1Gq7tuq6aoelMZflY/+EN5u28EN/21iWYIEGU3yB089XiKOA EyV3oYHqKpyeEIL4s2SItwMUQtaz5+Ak4pkLXKrfaEqD0vSsAphoc+e3rfOyZeKvzi42 zL/oeQsjGy0ruWWC8NxBAX/JwLyBSQmFkT4eZ7Pn8/UKCqM4T1k5CdrGugQOfaSv6Pn+ EgrbXdhOMRBAlCW5o6aa/v1hIU27IDuwm/WG6RkIfEMS3SCjyUcI+jgmPF89MeBe3t8c /ls2OfpCMxbmFJWjLHKaDT/sa+tRpPw7zo853yeV/R5QeC3u+D/pb5ISqBOh3GlOY9Ze xUaw== 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 j66si165586pfg.447.2017.06.15.03.55.11; Thu, 15 Jun 2017 03:55:11 -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 S1752701AbdFOKyx (ORCPT + 25 others); Thu, 15 Jun 2017 06:54:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:40536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751623AbdFOKwz (ORCPT ); Thu, 15 Jun 2017 06:52:55 -0400 Received: from gandalf.local.home (cpe-67-246-153-56.stny.res.rr.com [67.246.153.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C883239C3; Thu, 15 Jun 2017 10:52:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C883239C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Received: from rostedt by gandalf.local.home with local (Exim 4.87) (envelope-from ) id 1dLSOT-0003J7-7p; Thu, 15 Jun 2017 06:52:53 -0400 Message-Id: <20170615105253.167625738@goodmis.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Jun 2017 06:52:27 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Jeremy Linton Subject: [for-next][PATCH 04/12] trace: rename struct module entry for trace enums References: <20170615105223.551999981@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0004-trace-rename-struct-module-entry-for-trace-enums.patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton 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. Link: http://lkml.kernel.org/r/20170531215653.3240-4-jeremy.linton@arm.com Signed-off-by: Jeremy Linton Signed-off-by: Steven Rostedt (VMware) --- include/linux/module.h | 4 ++-- kernel/module.c | 6 +++--- kernel/trace/trace.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.10.2 diff --git a/include/linux/module.h b/include/linux/module.h index 46b48043d741..8eb9a1e693e5 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 9ec4713c5eee..df1c4a9e7abb 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 46fac3f63af1..061abd8ba101 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -7746,7 +7746,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; /* @@ -7756,7 +7756,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 @@ -7765,7 +7765,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);