From 2f3a89fa8da1878f8abcd1a997958c222b87c6d9 Mon Sep 17 00:00:00 2001
From: Andrew Boie <andrew.p.boie@intel.com>
Date: Wed, 11 Mar 2020 07:00:55 -0700
Subject: [PATCH] kernel: rename _k_object_assignment

Private structure, rename to z_object_assignment

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
---
 include/kernel.h             | 4 ++--
 include/linker/common-rom.ld | 6 +++---
 kernel/thread.c              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/kernel.h b/include/kernel.h
index c255a86ac53..fa331609772 100644
--- a/include/kernel.h
+++ b/include/kernel.h
@@ -194,7 +194,7 @@ struct _k_object {
 	union z_object_data data;
 } __packed __aligned(4);
 
-struct _k_object_assignment {
+struct z_object_assignment {
 	struct k_thread *thread;
 	void * const *objects;
 };
@@ -214,7 +214,7 @@ struct _k_object_assignment {
 #define K_THREAD_ACCESS_GRANT(name_, ...) \
 	static void * const _CONCAT(_object_list_, name_)[] = \
 		{ __VA_ARGS__, NULL }; \
-	static const Z_STRUCT_SECTION_ITERABLE(_k_object_assignment, \
+	static const Z_STRUCT_SECTION_ITERABLE(z_object_assignment, \
 					_CONCAT(_object_access_, name_)) = \
 			{ (&_k_thread_obj_ ## name_), \
 			  (_CONCAT(_object_list_, name_)) }
diff --git a/include/linker/common-rom.ld b/include/linker/common-rom.ld
index 3ed9e6d476c..f7e94955f86 100644
--- a/include/linker/common-rom.ld
+++ b/include/linker/common-rom.ld
@@ -53,9 +53,9 @@
 	 */
 	SECTION_PROLOGUE(object_access,,)
 	{
-		__k_object_assignment_list_start = .;
-		KEEP(*(".__k_object_assignment.*"))
-		__k_object_assignment_list_end = .;
+		_z_object_assignment_list_start = .;
+		KEEP(*("._z_object_assignment.*"))
+		_z_object_assignment_list_end = .;
 	} GROUP_LINK_IN(ROMABLE_REGION)
 #endif
 
diff --git a/kernel/thread.c b/kernel/thread.c
index b642e041051..d46320f4ca3 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -699,7 +699,7 @@ k_tid_t z_vrfy_k_thread_create(struct k_thread *new_thread,
 
 static void grant_static_access(void)
 {
-	Z_STRUCT_SECTION_FOREACH(_k_object_assignment, pos) {
+	Z_STRUCT_SECTION_FOREACH(z_object_assignment, pos) {
 		for (int i = 0; pos->objects[i] != NULL; i++) {
 			k_object_access_grant(pos->objects[i],
 					      pos->thread);