Subject: + signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch added to -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 From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 15 Apr 2014 12:28:48 -0700 The patch titled Subject: signals: rename rm_from_queue_full() to flush_sigqueue_mask() has been added to the -mm tree. Its filename is signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 @@ -705,11 +705,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; @@ -851,18 +848,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); @@ -3101,9 +3098,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); } } @@ -3112,7 +3109,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 signals-kill-sigfindinword.patch signals-s-siginitset-sigemptyset-in-do_sigtimedwait.patch signals-kill-rm_from_queue-change-prepare_signal-to-use-for_each_thread.patch signals-rename-rm_from_queue_full-to-flush_sigqueue_mask.patch signals-cleanup-the-usage-of-t-current-in-do_sigaction.patch signals-mv-disallow_signal-from-schedh-exitc-to-signal.patch signals-jffs2-fix-the-wrong-usage-of-disallow_signal.patch signals-kill-the-obsolete-sigdelset-and-recalc_sigpending-in-allow_signal.patch signals-disallow_signal-should-flush-the-potentially-pending-signal.patch signals-introduce-kernel_sigaction.patch signals-change-wait_for_helper-to-use-kernel_sigaction.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