diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 09:48:26 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-05-02 09:48:26 -0700 |
| commit | 0337966d121ebebf73a1c346123e8112796e684e (patch) | |
| tree | c0d4388591e72dc5a26ee976a9cbca70f6bafbbd /ipc/mqueue.c | |
| parent | 7c5bb4ac2b76d2a09256aec8a7d584bf3e2b0466 (diff) | |
| parent | 8a038b83e012097a7ac6cfb9f6c5fac1da8fad6e (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 4.12 merge window.
Diffstat (limited to 'ipc/mqueue.c')
| -rw-r--r-- | ipc/mqueue.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 7a2d8f0c8ae5..e8d41ff57241 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -35,6 +35,9 @@ #include <linux/ipc_namespace.h> #include <linux/user_namespace.h> #include <linux/slab.h> +#include <linux/sched/wake_q.h> +#include <linux/sched/signal.h> +#include <linux/sched/user.h> #include <net/sock.h> #include "util.h" @@ -558,6 +561,7 @@ static void wq_add(struct mqueue_inode_info *info, int sr, */ static int wq_sleep(struct mqueue_inode_info *info, int sr, ktime_t *timeout, struct ext_wait_queue *ewp) + __releases(&info->lock) { int retval; signed long time; |