Changeset 679 for GPL/trunk/include/linux/mutex.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• include/linux/mutex.h (modified) (2 diffs)

GPL/trunk/include/linux/mutex.h

@@ -3 +3 @@
 
 #include <asm/semaphore.h>
+#include <linux/list.h>
+#include <linux/types.h>
+
+struct mutex {
+        atomic_long_t           owner;
+        spinlock_t              wait_lock;
+#ifdef CONFIG_MUTEX_SPIN_ON_OWNER
+        struct optimistic_spin_queue osq; /* Spinner MCS lock */
+#endif
+        struct list_head        wait_list;
+#ifdef CONFIG_DEBUG_MUTEXES
+        void                    *magic;
+#endif
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+        struct lockdep_map      dep_map;
+#endif
+};
 
 #define mutex semaphore
@@ -11 +28 @@
 #define mutex_lock_interruptible(x) down_interruptible(x)
 #define mutex_unlock(x)         up(x)
-
+#define mutex_lock_nested(lock, subclass) mutex_lock(lock)
+static inline int mutex_trylock(struct mutex *lock) {return -1; }
 #endif