- C99 conformance
- removal of nowhere used conditional wait queue add macro
diff -durNp -X /tmp/diff.z44e2S linux-2.5.29/include/linux/wait.h linux/include/linux/wait.h
--- linux-2.5.29/include/linux/wait.h 2002-07-27 04:58:24.000000000 +0200
+++ linux/include/linux/wait.h 2002-08-01 14:30:37.000000000 +0200
@@ -43,16 +43,16 @@ typedef struct __wait_queue_head wait_qu
*/
#define __WAITQUEUE_INITIALIZER(name, tsk) { \
- task: tsk, \
- func: default_wake_function, \
- task_list: { NULL, NULL } }
+ .task = tsk, \
+ .func = default_wake_function, \
+ .task_list = { NULL, NULL } }
#define DECLARE_WAITQUEUE(name, tsk) \
wait_queue_t name = __WAITQUEUE_INITIALIZER(name, tsk)
#define __WAIT_QUEUE_HEAD_INITIALIZER(name) { \
- lock: SPIN_LOCK_UNLOCKED, \
- task_list: { &(name).task_list, &(name).task_list } }
+ .lock = SPIN_LOCK_UNLOCKED, \
+ .task_list = { &(name).task_list, &(name).task_list } }
#define DECLARE_WAIT_QUEUE_HEAD(name) \
wait_queue_head_t name = __WAIT_QUEUE_HEAD_INITIALIZER(name)
@@ -103,22 +103,6 @@ static inline void __remove_wait_queue(w
list_del(&old->task_list);
}
-#define add_wait_queue_cond(q, wait, cond) \
- ({ \
- unsigned long flags; \
- int _raced = 0; \
- spin_lock_irqsave(&(q)->lock, flags); \
- (wait)->flags = 0; \
- __add_wait_queue((q), (wait)); \
- rmb(); \
- if (!(cond)) { \
- _raced = 1; \
- __remove_wait_queue((q), (wait)); \
- } \
- spin_lock_irqrestore(&(q)->lock, flags); \
- _raced; \
- })
-
#endif /* __KERNEL__ */
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 07 2002 - 22:00:15 EST