aboutsummaryrefslogtreecommitdiffstats
path: root/ipc/sem.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-18 12:12:14 -0400
commitfac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch)
tree1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /ipc/sem.c
parent6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff)
parenta6360dd37e1a144ed11e6548371bade559a1e4df (diff)
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'ipc/sem.c')
-rw-r--r--ipc/sem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/sem.c b/ipc/sem.c
index ae040a0727c2..34193ed69fbe 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -1362,7 +1362,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
1362 * semid identifiers are not unique - find_alloc_undo may have 1362 * semid identifiers are not unique - find_alloc_undo may have
1363 * allocated an undo structure, it was invalidated by an RMID 1363 * allocated an undo structure, it was invalidated by an RMID
1364 * and now a new array with received the same id. Check and fail. 1364 * and now a new array with received the same id. Check and fail.
1365 * This case can be detected checking un->semid. The existance of 1365 * This case can be detected checking un->semid. The existence of
1366 * "un" itself is guaranteed by rcu. 1366 * "un" itself is guaranteed by rcu.
1367 */ 1367 */
1368 error = -EIDRM; 1368 error = -EIDRM;