epoll keyed wakeups - make __wake_up_locked accept a key parameter
PATCH 1/7 epoll keyed wakeups - make __wake_up_locked accept a key parameter
The following patch adds an extra "key" parameter to __wake_up_locked(). This allows the caller of this function (and all related macros) to specify a key to be passed to the wakeup callbacks.
Signed-off-by Davide Libenzi <[email protected]>
- Davide
--- include/linux/wait.h | 4 ++-- kernel/sched.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
include/linux/wait.h +2 -2
@@ -133,7 +133,7 @@ static inline void __remove_wait_queue(w }void __wake_up (wait_queue_head_t *q,unsigned int mode,int nr,void *key); -extern void __wake_up_locked (wait_queue_head_t *q,unsigned int mode); +extern void __wake_up_locked (wait_queue_head_t *q,unsigned int mode,void *key);extern void __wake_up_sync (wait_queue_head_t *q,unsigned int mode,int nr);void __wake_up_bit (wait_queue_head_t *,void *,int );int __wait_on_bit (wait_queue_head_t *,struct wait_bit_queue *,int (*)(void *),unsigned );
@@ -146,7 +146,7 @@ wait_queue_head_t *bit_waitqueue(void *,#define wake_up (x) __wake_up(x, TASK_NORMAL, 1, NULL)#define wake_up_nr (x, nr) __wake_up(x, TASK_NORMAL, nr, NULL)#define wake_up_all (x) __wake_up(x, TASK_NORMAL, 0, NULL) -#define wake_up_locked (x) __wake_up_locked((x), TASK_NORMAL) +#define wake_up_locked (x) __wake_up_locked((x), TASK_NORMAL, NULL)#define wake_up_interruptible (x) __wake_up(x, TASK_INTERRUPTIBLE, 1, NULL)#define wake_up_interruptible_nr (x, nr) __wake_up(x, TASK_INTERRUPTIBLE, nr, NULL)
kernel/sched.c +2 -2
@@ -4722,9 +4722,9 @@ EXPORT_SYMBOL(__wake_up);/* * Same as __wake_up but called with the spinlock in wait_queue_head_t held. */ -void __wake_up_locked (wait_queue_head_t *q,unsigned int mode) +void __wake_up_locked (wait_queue_head_t *q,unsigned int mode,void *key) { -__wake_up_common (q, mode,1 ,0 ,NULL ); +__wake_up_common (q, mode,1 ,0 , key); }/**