net: fec: don't disable enet_out clock

[karo-tx-linux.git] / ipc / msg.c

diff --git a/ipc/msg.c b/ipc/msg.c
index 1471db9a7e6112b3316ae887b50c6d8d1352f171..59559a215401a3763cfe15f15b8a16b3a22f4a52 100644 (file)
--- 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