diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h index 8bde1db951..3a8d5ac381 100644 --- a/include/zephyr/internal/syscall_handler.h +++ b/include/zephyr/internal/syscall_handler.h @@ -89,8 +89,8 @@ int k_object_validate(struct k_object *ko, enum k_objects otype, * @param ko If retval=-EPERM, struct k_object * that was looked up, or NULL * @param otype Expected type of the kernel object */ -void z_dump_object_error(int retval, const void *obj, - struct k_object *ko, enum k_objects otype); +void k_object_dump_error(int retval, const void *obj, + struct k_object *ko, enum k_objects otype); /** * Kernel object validation function @@ -437,7 +437,7 @@ static inline int k_object_validation_check(struct k_object *ko, #ifdef CONFIG_LOG if (ret != 0) { - z_dump_object_error(ret, obj, ko, otype); + k_object_dump_error(ret, obj, ko, otype); } #else ARG_UNUSED(obj); diff --git a/kernel/sched.c b/kernel/sched.c index aa736f6b68..87fe05fea0 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1888,7 +1888,7 @@ static bool thread_obj_validate(struct k_thread *thread) return true; default: #ifdef CONFIG_LOG - z_dump_object_error(ret, thread, ko, K_OBJ_THREAD); + k_object_dump_error(ret, thread, ko, K_OBJ_THREAD); #endif Z_OOPS(K_SYSCALL_VERIFY_MSG(ret, "access denied")); } diff --git a/kernel/userspace.c b/kernel/userspace.c index ffece57043..6fbff3ab4e 100644 --- a/kernel/userspace.c +++ b/kernel/userspace.c @@ -661,7 +661,7 @@ static void dump_permission_error(struct k_object *ko) LOG_HEXDUMP_ERR(ko->perms, sizeof(ko->perms), "permission bitmap"); } -void z_dump_object_error(int retval, const void *obj, struct k_object *ko, +void k_object_dump_error(int retval, const void *obj, struct k_object *ko, enum k_objects otype) { switch (retval) { diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c index 788534e6a9..5fb75d9209 100644 --- a/kernel/userspace_handler.c +++ b/kernel/userspace_handler.c @@ -24,7 +24,7 @@ static struct k_object *validate_kernel_object(const void *obj, ret = k_object_validate(ko, K_OBJ_ANY, _OBJ_INIT_ANY); if (ret != 0) { #ifdef CONFIG_LOG - z_dump_object_error(ret, obj, ko, otype); + k_object_dump_error(ret, obj, ko, otype); #endif return NULL; }