proc-rename-catch-function-argument.patch removed from -mm tree
The patch titled
Subject: proc: rename "catch" function argument
has been removed from the -mm tree. Its filename was
proc-rename-catch-function-argument.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Alexey Dobriyan <[email protected]>
Subject: proc: rename "catch" function argument
"catch" is reserved keyword in C++, rename it to something both gcc and g++ accept.
Rename "ign" for symmetry.
Signed-off-by Alexey Dobriyan <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
fs/proc/array.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/proc/array.c renamed from fs/proc/array.c~proc-rename-catch-function-argument +4 -4
@@ -248,8 +248,8 @@ void render_sigset_t(struct seq_file *m,seq_putc (m,'\n' ); } -static void collect_sigign_sigcatch (struct task_struct *p,sigset_t *ign, -sigset_t *catch) +static void collect_sigign_sigcatch (struct task_struct *p,sigset_t *sigign, +sigset_t *sigcatch) {struct k_sigaction *k;int i;
@@ -257,9 +257,9 @@ static void collect_sigign_sigcatch(stru k = p->sighand->action;for (i =1 ; i <= _NSIG; ++i, ++k) {if (k->sa.sa_handler ==SIG_IGN ) -sigaddset (ign, i); +sigaddset (sigign, i);else if (k->sa.sa_handler !=SIG_DFL ) -sigaddset (catch, i); +sigaddset (sigcatch, i); } }
_
Patches currently in -mm which might be from [email protected] are
ramfs-support-o_tmpfile.patch