aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-04-23 21:30:04 -0400
committerJohn M. Calandrino <jmc@jupiter-cs.cs.unc.edu>2007-04-23 21:30:04 -0400
commita1e68e80591e11cc6c3404304d2fa13bd515390d (patch)
treef8e536c966a9f54b941365d590702c95f363e60b /include
parent68de03e4f3d6ab361b50b7b44264bb802ca0a54d (diff)
Updated priority check for EDF. Converting spinlocks to queuelocks, not yet
complete.
Diffstat (limited to 'include')
-rw-r--r--include/linux/wait.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h
index c7e96b6b59..8c31e76d4c 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -21,7 +21,7 @@
21 21
22#include <linux/list.h> 22#include <linux/list.h>
23#include <linux/stddef.h> 23#include <linux/stddef.h>
24#include <linux/spinlock.h> 24#include <linux/queuelock.h>
25#include <asm/system.h> 25#include <asm/system.h>
26#include <asm/current.h> 26#include <asm/current.h>
27 27
@@ -48,7 +48,7 @@ struct wait_bit_queue {
48}; 48};
49 49
50struct __wait_queue_head { 50struct __wait_queue_head {
51 spinlock_t lock; 51 queuelock_t lock;
52 struct list_head task_list; 52 struct list_head task_list;
53}; 53};
54typedef struct __wait_queue_head wait_queue_head_t; 54typedef struct __wait_queue_head wait_queue_head_t;
@@ -348,7 +348,7 @@ do { \
348}) 348})
349 349
350/* 350/*
351 * Must be called with the spinlock in the wait_queue_head_t held. 351 * Must be called with the queuelock in the wait_queue_head_t held.
352 */ 352 */
353static inline void add_wait_queue_exclusive_locked(wait_queue_head_t *q, 353static inline void add_wait_queue_exclusive_locked(wait_queue_head_t *q,
354 wait_queue_t * wait) 354 wait_queue_t * wait)
@@ -358,7 +358,7 @@ static inline void add_wait_queue_exclusive_locked(wait_queue_head_t *q,
358} 358}
359 359
360/* 360/*
361 * Must be called with the spinlock in the wait_queue_head_t held. 361 * Must be called with the queuelock in the wait_queue_head_t held.
362 */ 362 */
363static inline void remove_wait_queue_locked(wait_queue_head_t *q, 363static inline void remove_wait_queue_locked(wait_queue_head_t *q,
364 wait_queue_t * wait) 364 wait_queue_t * wait)