Merge branch 'for-4.1/sensor-hub' into for-linus

[mirror_ubuntu-artful-kernel.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 6115146563f94e5bfab0973be730b3388fb3fc59..92842113c6a9dfff0ca026f6ec2ff1bc663b2f38 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1941,7 +1941,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
        queue.sleeper = current;
 
 sleep_again:
-       current->state = TASK_INTERRUPTIBLE;
+       __set_current_state(TASK_INTERRUPTIBLE);
        sem_unlock(sma, locknum);
        rcu_read_unlock();