Merge commit 'gcl/gcl-next' into next

[deliverable/linux.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index 082122469b17490c1d0a1b634055efc079be81c1..c68cd3f8f0c92259d9a0af3be4ec3adc6b3ad559 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -58,7 +58,7 @@
  * SMP-threaded, sysctl's added
  * (c) 1999 Manfred Spraul <manfred@colorfullife.com>
  * Enforced range limit on SEM_UNDO
- * (c) 2001 Red Hat Inc <alan@redhat.com>
+ * (c) 2001 Red Hat Inc
  * Lockless wakeup
  * (c) 2003 Manfred Spraul <manfred@colorfullife.com>
  *
@@ -1216,7 +1216,6 @@ asmlinkage long sys_semtimedop(int semid, struct sembuf __user *tsops,
        if (timeout && jiffies_left == 0)
                error = -EAGAIN;
        list_del(&queue.list);
-       goto out_unlock_free;
 
 out_unlock_free:
        sem_unlock(sma);