diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2011-03-31 11:08:29 -0400 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2011-03-31 11:08:29 -0400 |
| commit | 53c37bbcc07707f88312efca136aa239f25d775c (patch) | |
| tree | 17f0adc8f3743f515d5829a37960d3eebc26b7a3 /include | |
| parent | c089cad00c670bf41edecf0aed688fe8d2f43125 (diff) | |
| parent | 0f6a8e02773f8c23b5b6a3dbfa044e50c9d7d811 (diff) | |
Merge remote branch 'origin/wip-fmlp-dequeue' into wip-k-fmlp
Conflicts:
include/litmus/litmus.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/litmus/litmus.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h index befdf6381693..3df242bf272f 100644 --- a/include/litmus/litmus.h +++ b/include/litmus/litmus.h | |||
| @@ -26,8 +26,8 @@ static inline int in_list(struct list_head* list) | |||
| 26 | ); | 26 | ); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | struct task_struct* waitqueue_first(wait_queue_head_t *wq); | 29 | |
| 30 | struct task_struct* waitqueue_first_and_remove(wait_queue_head_t *wq); | 30 | struct task_struct* __waitqueue_remove_first(wait_queue_head_t *wq); |
| 31 | 31 | ||
| 32 | #define NO_CPU 0xffffffff | 32 | #define NO_CPU 0xffffffff |
| 33 | 33 | ||