Subject: [folded-merged] ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues-fix.patch removed from -mm tree To: manfred@xxxxxxxxxxxxxxxx,davidlohr.bueso@xxxxxx,riel@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Mon, 08 Jul 2013 15:31:57 -0700 The patch titled Subject: ipc/sem.c: scan complex wait-for-zero after undefined updates has been removed from the -mm tree. Its filename was ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues-fix.patch This patch was dropped because it was folded into ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues.patch ------------------------------------------------------ From: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx> Subject: ipc/sem.c: scan complex wait-for-zero after undefined updates After an update of a semaphore array that does not use struct sembuf, complex wait-for-zero operations were not checked if they are able to proceed. Signed-off-by: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Davidlohr Bueso <davidlohr.bueso@xxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- ipc/sem.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN ipc/sem.c~ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues-fix ipc/sem.c --- a/ipc/sem.c~ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues-fix +++ a/ipc/sem.c @@ -726,8 +726,10 @@ static int do_smart_wakeup_zero(struct s * Assume all were changed. */ for (i = 0; i < sma->sem_nsems; i++) { - if (sma->sem_base[i].semval == 0) + if (sma->sem_base[i].semval == 0) { + got_zero = 1; semop_completed |= wake_const_ops(sma, i, pt); + } } } /* _ Patches currently in -mm which might be from manfred@xxxxxxxxxxxxxxxx are ipc-utilc-ipc_rcu_alloc-cacheline-align-allocation.patch ipc-semc-cacheline-align-the-semaphore-structures.patch ipc-sem-separate-wait-for-zero-and-alter-tasks-into-seperate-queues.patch ipc-semc-always-use-only-one-queue-for-alter-operations.patch ipc-semc-replace-shared-sem_otime-with-per-semaphore-value.patch ipc-semc-rename-try_atomic_semop-to-perform_atomic_semop-docu-update.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