Changeset d5a89a3 in mainline for kernel/generic/include/synch/spinlock.h

Timestamp:

2019-02-11T22:31:04Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

File:

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

kernel/generic/include/synch/spinlock.h

@@ -103 +103 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_lock(spinlock_t *lock)
 {
         preemption_disable();
@@ -115 +115 @@
  * @param lock  Pointer to spinlock_t structure.
  */
-NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
+_NO_TRACE static inline void spinlock_unlock(spinlock_t *lock)
 {
         atomic_flag_clear_explicit(&lock->flag, memory_order_release);