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

Timestamp:

2019-02-12T20:42:42Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

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);