Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e64d66c8 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Matthew Wilcox
Browse files

wait: Use TASK_NORMAL 



Also move wake_up_locked() to be with the related functions

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
parent 6d8982d9

include/linux/wait.h

+6 −5
Original line number Diff line number Diff line
@@ -152,13 +152,14 @@ int FASTCALL(out_of_line_wait_on_bit(void *, int, int (*)(void *), unsigned)); 
int FASTCALL(out_of_line_wait_on_bit_lock(void *, int, int (*)(void *), unsigned));

wait_queue_head_t *FASTCALL(bit_waitqueue(void *, int));



#define wake_up(x)			__wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 1, NULL)

#define wake_up_nr(x, nr)		__wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, nr, NULL)

#define wake_up_all(x)			__wake_up(x, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 0, NULL)

#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_interruptible(x)	__wake_up(x, TASK_INTERRUPTIBLE, 1, NULL)

#define wake_up_interruptible_nr(x, nr)	__wake_up(x, TASK_INTERRUPTIBLE, nr, NULL)

#define wake_up_interruptible_all(x)	__wake_up(x, TASK_INTERRUPTIBLE, 0, NULL)

#define	wake_up_locked(x)		__wake_up_locked((x), TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE)

#define wake_up_interruptible_sync(x)	__wake_up_sync((x), TASK_INTERRUPTIBLE, 1)



#define __wait_event(wq, condition) 					\

kernel/wait.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void fastcall __wake_up_bit(wait_queue_head_t *wq, void *word, int bit) 
{

	struct wait_bit_key key = __WAIT_BIT_KEY_INITIALIZER(word, bit);

	if (waitqueue_active(wq))

		__wake_up(wq, TASK_INTERRUPTIBLE|TASK_UNINTERRUPTIBLE, 1, &key);

		__wake_up(wq, TASK_NORMAL, 1, &key);

}

EXPORT_SYMBOL(__wake_up_bit);