diff --git a/[refs] b/[refs]
index be9315b2f711..807a8da1844b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c24783bb2deafaa106b7e69a97540071afc590c
+refs/heads/master: 0b0577f6080c0645b079dcc03fdbaf40d928beb8
diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c
index fb13be17945b..227948f28ce6 100644
--- a/trunk/ipc/sem.c
+++ b/trunk/ipc/sem.c
@@ -1426,6 +1426,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
 
 	queue.status = -EINTR;
 	queue.sleeper = current;
+
+sleep_again:
 	current->state = TASK_INTERRUPTIBLE;
 	sem_unlock(sma);
 
@@ -1478,6 +1480,13 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
 	 */
 	if (timeout && jiffies_left == 0)
 		error = -EAGAIN;
+
+	/*
+	 * If the wakeup was spurious, just retry
+	 */
+	if (error == -EINTR && !signal_pending(current))
+		goto sleep_again;
+
 	unlink_queue(sma, &queue);
 
 out_unlock_free: