diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-21 13:44:03 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-09-21 13:44:03 +1000 |
| commit | 7fcd5213453278de3c95a9957746bb396be0547b (patch) | |
| tree | 8b71c0ce39bb86c35f65a780d241a0ad5f02bb21 /ipc | |
| parent | ef47e32123ea4beab6219313fe839ceed6890821 (diff) | |
| parent | 8cebeb996ea1ba3d6bd667ac31f54392a4275600 (diff) | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/msg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c index 66c4f567eb73..f675689290ca 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -37,6 +37,7 @@ #include <linux/rwsem.h> #include <linux/nsproxy.h> #include <linux/ipc_namespace.h> +#include <linux/freezer.h> #include <asm/current.h> #include <linux/uaccess.h> @@ -675,7 +676,7 @@ long do_msgsnd(int msqid, long mtype, void __user *mtext, ipc_unlock_object(&msq->q_perm); rcu_read_unlock(); - schedule(); + freezable_schedule(); rcu_read_lock(); ipc_lock_object(&msq->q_perm); @@ -917,7 +918,7 @@ long do_msgrcv(int msqid, void __user *buf, size_t bufsz, long msgtyp, int msgfl ipc_unlock_object(&msq->q_perm); rcu_read_unlock(); - schedule(); + freezable_schedule(); /* Lockless receive, part 1: * Disable preemption. We don't hold a reference to the queue |