[for-next,02/12] trace: rename kernel enum section to eval

Message ID	20170615105252.867147004@goodmis.org
State	Accepted
Commit	02fd7f68f5342bc7e8054cb05ea4a07f26d41d12
Headers	show Delivered-To: patch@linaro.org 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; DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 038BF239B0 Message-Id: <20170615105252.867147004@goodmis.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Jun 2017 06:52:25 -0400 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org Cc: Ingo Molnar <mingo@kernel.org>, Andrew Morton <akpm@linux-foundation.org>, Jeremy Linton <jeremy.linton@arm.com> Subject: [for-next][PATCH 02/12] trace: rename kernel enum section to eval References: <20170615105223.551999981@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0002-trace-rename-kernel-enum-section-to-eval.patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [for-next,02/12] trace: rename kernel enum section to eval [for-next,03/12] trace: rename trace_enum_map to trace_eval_map [for-next,04/12] trace: rename struct module entry for trace enums [for-next,05/12] trace: rename trace enum data structures in trace.c [for-next,06/12] trace: rename trace_enum_mutex to trace_eval_mutex [for-next,07/12] trace: rename trace.c enum functions [for-next,08/12] trace: rename enum_map functions [for-next,09/12] tracing: Rename enum_replace to eval_replace [for-next,10/12] tracing: define TRACE_DEFINE_SIZEOF() macro to map sizeofs to their values [for-next,11/12] tracing: Add TRACE_DEFINE_SIZEOF() macros [for-next,12/12] tracing: Rename update the enum_map file

Message ID

20170615105252.867147004@goodmis.org

State

Accepted

Commit

02fd7f68f5342bc7e8054cb05ea4a07f26d41d12

Headers

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; 
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 038BF239B0
Message-Id: <20170615105252.867147004@goodmis.org>
User-Agent: quilt/0.63-1
Date: Thu, 15 Jun 2017 06:52:25 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jeremy Linton <jeremy.linton@arm.com>
Subject: [for-next][PATCH 02/12] trace: rename kernel enum section to eval
References: <20170615105223.551999981@goodmis.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Disposition: inline;
	filename=0002-trace-rename-kernel-enum-section-to-eval.patch
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Series

None | expand

Commit Message

Steven Rostedt June 15, 2017, 10:52 a.m. UTC

From: Jeremy Linton <jeremy.linton@arm.com>


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.

Link: http://lkml.kernel.org/r/20170531215653.3240-2-jeremy.linton@arm.com

Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>

Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

---
 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.10.2

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 314a0b9219c6..800f9f9677a6 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 00f643164ca2..4bdd84023f5b 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 4a3665f8f837..9ec4713c5eee 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 63deff9cdf2c..acd3eb4d56a0 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -7732,15 +7732,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

[for-next,02/12] trace: rename kernel enum section to eval

Commit Message

Patch