diff options
| -rw-r--r-- | include/bakery_lock.h | 2 | ||||
| -rw-r--r-- | lib/sync/locks/bakery/bakery_lock.c | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/include/bakery_lock.h b/include/bakery_lock.h index 96153bc..c7ff903 100644 --- a/include/bakery_lock.h +++ b/include/bakery_lock.h @@ -45,8 +45,6 @@ typedef struct { #define NO_OWNER (-1) void bakery_lock_init(bakery_lock* bakery); -/* Check whether a lock is held. Mainly used for debug purpose. */ -int bakery_lock_held(unsigned long mpidr, const bakery_lock * bakery); void bakery_lock_get(unsigned long mpidr, bakery_lock* bakery); void bakery_lock_release(unsigned long mpidr, bakery_lock* bakery); int bakery_lock_try(unsigned long mpidr, bakery_lock* bakery); diff --git a/lib/sync/locks/bakery/bakery_lock.c b/lib/sync/locks/bakery/bakery_lock.c index 9641248..444b6a1 100644 --- a/lib/sync/locks/bakery/bakery_lock.c +++ b/lib/sync/locks/bakery/bakery_lock.c @@ -88,17 +88,8 @@ void bakery_lock_release(unsigned long mpidr, bakery_lock * bakery) unsigned int entry = platform_get_core_pos(mpidr); assert_bakery_entry_valid(entry, bakery); - assert(bakery_lock_held(entry, bakery)); + assert(bakery->owner == entry); bakery->owner = NO_OWNER; bakery->number[entry] = 0; } - -int bakery_lock_held(unsigned long mpidr, const bakery_lock * bakery) -{ - unsigned int entry = platform_get_core_pos(mpidr); - - assert_bakery_entry_valid(entry, bakery); - - return bakery->owner == entry; -} |