]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
proc: rename "catch" function argument
authorAlexey Dobriyan <adobriyan@gmail.com>
Thu, 4 Jun 2020 23:49:55 +0000 (16:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Jun 2020 02:06:24 +0000 (19:06 -0700)
"catch" is reserved keyword in C++, rename it to something both gcc and
g++ accept.

Rename "ign" for symmetry.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200331210905.GA31680@avx2
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/proc/array.c

index 8e16f14bb05af7eb9b0e0f31eaa8165b622560d9..c4ac25fdb230ce1cbc33704075c9af3aa79f6c05 100644 (file)
@@ -248,8 +248,8 @@ void render_sigset_t(struct seq_file *m, const char *header,
        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(struct task_struct *p, sigset_t *ign,
        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);
        }
 }