Changeset 543662b in mainline

Timestamp:

2018-11-20T18:57:09Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0705fc5

Parents:

a615be0

Message:

Fix non-debug build

File:

• kernel/generic/include/synch/spinlock.h (modified) (2 diffs)

kernel/generic/include/synch/spinlock.h

@@ -99 +99 @@
         assert(expr)
 
-#define spinlock_lock(lock)    atomic_lock_arch(&(lock)->val)
-#define spinlock_unlock(lock)  spinlock_unlock_nondebug((lock))
+/** Acquire spinlock
+ *
+ * @param lock  Pointer to spinlock_t structure.
+ */
+NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
+{
+        preemption_disable();
+        while (atomic_flag_test_and_set_explicit(&lock->flag,
+            memory_order_acquire))
+                ;
+}
+
+/** Release spinlock
+ *
+ * @param lock  Pointer to spinlock_t structure.
+ */
+NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
+{
+        atomic_flag_clear_explicit(&lock->flag, memory_order_release);
+        preemption_enable();
+}
 
 #endif /* CONFIG_DEBUG_SPINLOCK */
@@ -115 +134 @@
 extern void spinlock_unlock_debug(spinlock_t *);
 extern bool spinlock_locked(spinlock_t *);
-
-/** Unlock spinlock
- *
- * Unlock spinlock for non-debug kernels.
- *
- * @param sl Pointer to spinlock_t structure.
- *
- */
-NO_TRACE static inline void spinlock_unlock_nondebug(spinlock_t *lock)
-{
-        atomic_flag_clear_explicit(&lock->flag, memory_order_release);
-        preemption_enable();
-}
 
 #ifdef CONFIG_DEBUG_SPINLOCK