Changeset 679 for GPL/trunk/include/linux/wait.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/wait.h (modified) (6 diffs)

GPL/trunk/include/linux/wait.h

@@ -12 +12 @@
 
 #include <linux/spinlock.h>
+#include <linux/list.h>
+#include <asm/page.h>
 
-#include <asm/page.h>
+typedef struct wait_queue_entry wait_queue_entry_t;
+
+typedef int (*wait_queue_func_t)(struct wait_queue_entry *wq_entry, unsigned mode, int flags, void *key);
+
+/*
+ * A single wait-queue entry structure:
+ */
+struct wait_queue_entry {
+        unsigned int            flags;
+        void                    *private;
+        wait_queue_func_t       func;
+        struct list_head        entry;
+};
 
 /*
@@ -30 +44 @@
 };
 typedef struct __wait_queue wait_queue_t;
+
+struct __wait_queue_head {
+        spinlock_t              lock;
+        struct list_head        task_list;
+};
+
+struct wait_queue_head {
+        spinlock_t              lock;
+        struct list_head        head;
+};
+typedef struct wait_queue_head wait_queue_head_t;
 
 /*
@@ -65 +90 @@
 #endif
 
-struct __wait_queue_head {
-        void * lock;
-        void * task_list;
-#if WAITQUEUE_DEBUG
-        long __magic;
-        long __creator;
-#endif
-};
-typedef struct __wait_queue_head wait_queue_head_t;
-
 #if WAITQUEUE_DEBUG
 # define __WAITQUEUE_DEBUG_INIT(name) \
@@ -91 +106 @@
 
 #define __WAIT_QUEUE_HEAD_INITIALIZER(name) \
-{ WAITQUEUE_RW_LOCK_UNLOCKED, { &(name).task_list, &(name).task_list } \
+{ WAITQUEUE_RW_LOCK_UNLOCKED, { &(name).head, &(name).head } \
                 __WAITQUEUE_HEAD_DEBUG_INIT(name)}
 
@@ -99 +114 @@
 void init_waitqueue_head(wait_queue_head_t *q);
 
-void init_waitqueue_entry(wait_queue_t *q, struct task_struct *p);
+extern void init_waitqueue_entry(struct wait_queue_entry *wq_entry, struct task_struct *p);
+extern void add_wait_queue(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
+extern void add_wait_queue_exclusive(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
+extern void remove_wait_queue(struct wait_queue_head *wq_head, struct wait_queue_entry *wq_entry);
 
 int waitqueue_active(wait_queue_head_t *q);
@@ -110 +128 @@
 void __add_wait_queue_tail(wait_queue_head_t *head, wait_queue_t *new);
 void __remove_wait_queue(wait_queue_head_t *head, wait_queue_t *old);
-
+void __wake_up_locked(wait_queue_head_t *q, unsigned int mode, int nr);
 #endif /* __KERNEL__ */
-
+#define wait_event_lock_irq(wq_head, condition, lock)
+#define wake_up_all(x)                  
 #endif