summaryrefslogtreecommitdiff
path: root/ipc/msg.c
diff options
context:
space:
mode:
authorMaxime Ripard <maxime@cerno.tech>2021-05-27 14:32:13 +0200
committerMaxime Ripard <maxime@cerno.tech>2021-05-27 14:32:13 +0200
commitffa52910faff64f2070af42c22d782c4572d889e (patch)
tree18c103f25a1467d02af1ebf27d7f0a8b177f5825 /ipc/msg.c
parent5ccbb2ee039f0bd81e2b34b670718186753a4e17 (diff)
parent5522e9f7b0fbe2a0cb89c199b574523becc8c3ab (diff)
Merge drm/drm-next into drm-misc-next
i915 is broken without -rc3, let's bring that tag in to fix it. Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'ipc/msg.c')
-rw-r--r--ipc/msg.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ipc/msg.c b/ipc/msg.c
index acd1bc7af55a..6e6c8e0c9380 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -251,11 +251,13 @@ static void expunge_all(struct msg_queue *msq, int res,
struct msg_receiver *msr, *t;
list_for_each_entry_safe(msr, t, &msq->q_receivers, r_list) {
- get_task_struct(msr->r_tsk);
+ struct task_struct *r_tsk;
+
+ r_tsk = get_task_struct(msr->r_tsk);
/* see MSG_BARRIER for purpose/pairing */
smp_store_release(&msr->r_msg, ERR_PTR(res));
- wake_q_add_safe(wake_q, msr->r_tsk);
+ wake_q_add_safe(wake_q, r_tsk);
}
}