diff --git a/include/microkernel/entries.h b/include/microkernel/entries.h index b08e21c50dc..81b3c4922b2 100644 --- a/include/microkernel/entries.h +++ b/include/microkernel/entries.h @@ -60,7 +60,7 @@ extern void K_waitmacc(struct k_args *); extern void K_waitmend(struct k_args *); extern void K_waitmtmo(struct k_args *); extern void K_inqsema(struct k_args *); -extern void K_lockreq(struct k_args *); +extern void _k_mutex_lock_request(struct k_args *); extern void _k_mutex_lock_reply(struct k_args *); extern void K_unlock(struct k_args *); extern void K_enqreq(struct k_args *); diff --git a/kernel/microkernel/include/kres.h b/kernel/microkernel/include/kres.h index 4ad03cae4b4..b37005dbe28 100644 --- a/kernel/microkernel/include/kres.h +++ b/kernel/microkernel/include/kres.h @@ -33,7 +33,7 @@ #ifndef KRES_H #define KRES_H -extern void K_lockreq(struct k_args *A); +extern void _k_mutex_lock_request(struct k_args *A); extern void _k_mutex_lock_reply(struct k_args *A); extern void K_unlock(struct k_args *A); diff --git a/kernel/microkernel/k_mutex.c b/kernel/microkernel/k_mutex.c index db13a35de2b..ad8f7fe8418 100644 --- a/kernel/microkernel/k_mutex.c +++ b/kernel/microkernel/k_mutex.c @@ -143,7 +143,7 @@ void _k_mutex_lock_reply( /******************************************************************************* * -* K_lockreq - process a mutex lock request +* _k_mutex_lock_request - process a mutex lock request * * This routine processes a mutex lock request (LOCK_REQ). If the mutex * is already locked, and the timeout is non-zero then the priority inheritance @@ -154,7 +154,7 @@ void _k_mutex_lock_reply( * \NOMANUAL */ -void K_lockreq(struct k_args *A /* pointer to mutex lock +void _k_mutex_lock_request(struct k_args *A /* pointer to mutex lock request arguments */ ) { diff --git a/scripts/sysgen.py b/scripts/sysgen.py index 75346437811..1d780ca92d7 100755 --- a/scripts/sysgen.py +++ b/scripts/sysgen.py @@ -775,7 +775,7 @@ def kernel_main_c_kernel_services(): "/* 18 */ K_waitmend,", # depends on semaphores "/* 19 */ K_waitmtmo,", # depends on semaphores and timers "/* 20 */ K_inqsema,", # depends on semaphores -"/* 21 */ K_lockreq,", # depends on mutexes +"/* 21 */ _k_mutex_lock_request,", # depends on mutexes "/* 22 */ _k_mutex_lock_reply,", # depends on mutexes "/* 23 */ _k_mutex_lock_reply,", # depends on mutexes and timers "/* 24 */ K_unlock,", # depends on mutexes