diff options
author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /ipc/sem.c | |
parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'ipc/sem.c')
-rw-r--r-- | ipc/sem.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |