Subject: [merged] signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch removed from -mm tree
To: oleg@xxxxxxxxxx,dwmw2@xxxxxxxxxxxxx,fweisbec@xxxxxxxxx,geert@xxxxxxxxxxxxxx,mathieu.desnoyers@xxxxxxxxxxxx,mingo@xxxxxxxxxx,peterz@xxxxxxxxxxxxx,richard@xxxxxx,rostedt@xxxxxxxxxxx,tj@xxxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 09 Jun 2014 12:33:52 -0700
The patch titled
Subject: signals: rename rm_from_queue_full() to flush_sigqueue_mask()
has been removed from the -mm tree. Its filename was
signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Oleg Nesterov <oleg@xxxxxxxxxx>
Subject: signals: rename rm_from_queue_full() to flush_sigqueue_mask()
"rm_from_queue_full" looks ugly and misleading, especially now that
rm_from_queue() has gone away. Rename it to flush_sigqueue_mask(), this
matches flush_sigqueue() we already have.
Also remove the obsolete comment which explains the difference with
rm_from_queue() we already killed.
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxxxx>
Cc: Richard Weinberger <richard@xxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Cc: Tejun Heo <tj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/signal.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff -puN kernel/signal.c~signals-rename-rm_from_queue_full-to-flush_sigqueue_mask kernel/signal.c
--- a/kernel/signal.c~signals-rename-rm_from_queue_full-to-flush_sigqueue_mask
+++ a/kernel/signal.c
@@ -706,11 +706,8 @@ void signal_wake_up_state(struct task_st
* Returns 1 if any signals were found.
*
* All callers must be holding the siglock.
- *
- * This version takes a sigset mask and looks at all signals,
- * not just those in the first mask word.
*/
-static int rm_from_queue_full(sigset_t *mask, struct sigpending *s)
+static int flush_sigqueue_mask(sigset_t *mask, struct sigpending *s)
{
struct sigqueue *q, *n;
sigset_t m;
@@ -852,18 +849,18 @@ static bool prepare_signal(int sig, stru
* This is a stop signal. Remove SIGCONT from all queues.
*/
siginitset(&flush, sigmask(SIGCONT));
- rm_from_queue_full(&flush, &signal->shared_pending);
+ flush_sigqueue_mask(&flush, &signal->shared_pending);
for_each_thread(p, t)
- rm_from_queue_full(&flush, &t->pending);
+ flush_sigqueue_mask(&flush, &t->pending);
} else if (sig == SIGCONT) {
unsigned int why;
/*
* Remove all stop signals from all queues, wake all threads.
*/
siginitset(&flush, SIG_KERNEL_STOP_MASK);
- rm_from_queue_full(&flush, &signal->shared_pending);
+ flush_sigqueue_mask(&flush, &signal->shared_pending);
for_each_thread(p, t) {
- rm_from_queue_full(&flush, &t->pending);
+ flush_sigqueue_mask(&flush, &t->pending);
task_clear_jobctl_pending(t, JOBCTL_STOP_PENDING);
if (likely(!(t->ptrace & PT_SEIZED)))
wake_up_state(t, __TASK_STOPPED);
@@ -3102,9 +3099,9 @@ int do_sigaction(int sig, struct k_sigac
if (sig_handler_ignored(sig_handler(t, sig), sig)) {
sigemptyset(&mask);
sigaddset(&mask, sig);
- rm_from_queue_full(&mask, &t->signal->shared_pending);
+ flush_sigqueue_mask(&mask, &t->signal->shared_pending);
do {
- rm_from_queue_full(&mask, &t->pending);
+ flush_sigqueue_mask(&mask, &t->pending);
} while_each_thread(current, t);
}
}
@@ -3113,7 +3110,7 @@ int do_sigaction(int sig, struct k_sigac
return 0;
}
-static int
+static int
do_sigaltstack (const stack_t __user *uss, stack_t __user *uoss, unsigned long sp)
{
stack_t oss;
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
origin.patch
cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline.patch
linux-next.patch
kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection.patch
kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix.patch
nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current.patch
nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-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
