Merge branch 'work.sane_pwd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 7e59ebc2c25e669ef60f54d6e3ae6839c34d2f2a..ca92bcfeb322f3f836031ec8b3ab21867f39adf5 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -1237,7 +1237,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
                }
                /*
                 * This sighand can be already freed and even reused, but
-                * we rely on SLAB_DESTROY_BY_RCU and sighand_ctor() which
+                * we rely on SLAB_TYPESAFE_BY_RCU and sighand_ctor() which
                 * initializes ->siglock: this slab can't go away, it has
                 * the same object type, ->siglock can't be reinitialized.
                 *
@@ -1318,7 +1318,7 @@ int kill_pid_info(int sig, struct siginfo *info, struct pid *pid)
        }
 }
 
-int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
+static int kill_proc_info(int sig, struct siginfo *info, pid_t pid)
 {
        int error;
        rcu_read_lock();