The patch titled
Subject: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
has been removed from the -mm tree. Its filename was
ipc-sem-rework-task-wakeups-fix.patch
This patch was dropped because it was folded into ipc-sem-rework-task-wakeups.patch
------------------------------------------------------
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Subject: ipc/sem: merge fix for WAKE_Q to DEFINE_WAKE_Q rename
Link: http://lkml.kernel.org/r/20161122210410.5eca9fc2@xxxxxxxxxxxxxxxx
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Davidlohr Bueso <dbueso@xxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/sem.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN ipc/sem.c~ipc-sem-rework-task-wakeups-fix ipc/sem.c
--- a/ipc/sem.c~ipc-sem-rework-task-wakeups-fix
+++ a/ipc/sem.c
@@ -1059,7 +1059,7 @@ static void freeary(struct ipc_namespace
struct sem_queue *q, *tq;
struct sem_array *sma = container_of(ipcp, struct sem_array, sem_perm);
int i;
- WAKE_Q(wake_q);
+ DEFINE_WAKE_Q(wake_q);
/* Free the existing undo structures for this semaphore set. */
ipc_assert_locked_object(&sma->sem_perm);
@@ -1239,7 +1239,7 @@ static int semctl_setval(struct ipc_name
struct sem_array *sma;
struct sem *curr;
int err, val;
- WAKE_Q(wake_q);
+ DEFINE_WAKE_Q(wake_q);
#if defined(CONFIG_64BIT) && defined(__BIG_ENDIAN)
/* big-endian 64bit */
@@ -1309,7 +1309,7 @@ static int semctl_main(struct ipc_namesp
int err, nsems;
ushort fast_sem_io[SEMMSL_FAST];
ushort *sem_io = fast_sem_io;
- WAKE_Q(wake_q);
+ DEFINE_WAKE_Q(wake_q);
rcu_read_lock();
sma = sem_obtain_object_check(ns, semid);
@@ -1848,7 +1848,7 @@ SYSCALL_DEFINE4(semtimedop, int, semid,
error = perform_atomic_semop(sma, &queue);
if (error == 0) { /* non-blocking succesfull path */
- WAKE_Q(wake_q);
+ DEFINE_WAKE_Q(wake_q);
/*
* If the operation was successful, then do
@@ -2031,7 +2031,7 @@ void exit_sem(struct task_struct *tsk)
struct sem_array *sma;
struct sem_undo *un;
int semid, i;
- WAKE_Q(wake_q);
+ DEFINE_WAKE_Q(wake_q);
cond_resched();
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
ipc-sem-rework-task-wakeups.patch
mm-add-locked-parameter-to-get_user_pages_remote-fix.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
