wait: Use TASK_NORMAL

Also move wake_up_locked() to be with the related functions

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>

diff --cc include/linux/wait.h
Simple merge

diff --cc kernel/wait.c
Simple merge