Subject: [folded-merged] ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix-2.patch removed from -mm tree
To: davidlohr@xxxxxx,jkosina@xxxxxxx,manfred@xxxxxxxxxxxxxxxx,pmladek@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 27 Jan 2014 16:55:26 -0800
The patch titled
Subject: ipc,sem: correct header comment for perform_atomic_semop
has been removed from the -mm tree. Its filename was
ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix-2.patch
This patch was dropped because it was folded into ipc-semc-avoid-overflow-of-semop-undo-semadj-value.patch
------------------------------------------------------
From: Davidlohr Bueso <davidlohr@xxxxxx>
Subject: ipc,sem: correct header comment for perform_atomic_semop
correct header comment for perform_atomic_semop()
Signed-off-by: Davidlohr Bueso <davidlohr@xxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/sem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN ipc/sem.c~ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix-2 ipc/sem.c
--- a/ipc/sem.c~ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix-2
+++ a/ipc/sem.c
@@ -584,10 +584,11 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
return ipcget(ns, &sem_ids(ns), &sem_ops, &sem_params);
}
-/** perform_atomic_semop - Perform (if possible) a semaphore operation
+/**
+ * perform_atomic_semop - Perform (if possible) a semaphore operation
* @sma: semaphore array
* @sops: array with operations that should be checked
- * @nsems: number of sops
+ * @nsops: number of operations
* @un: undo array
* @pid: pid that did the change
*
@@ -595,7 +596,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
* Returns 1 if the operation is impossible, the caller must sleep.
* Negative values are error codes.
*/
-
static int perform_atomic_semop(struct sem_array *sma, struct sembuf *sops,
int nsops, struct sem_undo *un, int pid)
{
_
Patches currently in -mm which might be from davidlohr@xxxxxx are
origin.patch
ipc-semc-avoid-overflow-of-semop-undo-semadj-value.patch
ipc-introduce-ipc_valid_object-helper-to-sort-out-ipc_rmid-races.patch
ipc-change-kern_ipc_permdeleted-type-to-bool.patch
ipc-whitespace-cleanup.patch
ipc-standardize-code-comments.patch
ipc-remove-braces-for-single-statements.patch
ipc-remove-useless-return-statement.patch
ipc-simplify-sysvipc_proc_open-return.patch
ipc-delete-seq_max-field-in-struct-ipc_ids.patch
ipcmsg-document-barriers.patch
ipcmsg-document-barriers-fix.patch
ipcmsg-document-barriers-fix-fix.patch
ipc-fix-compat-msgrcv-with-negative-msgtyp.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
