fs/proc/base.c, kernel/latencytop.c: convert sprintf_symbol() to %ps

[firefly-linux-kernel-4.4.55.git] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 30ae00fbecd591591acb55c1431d62a1bbbac427..2a5df2b7da83be0c3d69d9bcd33dd3bd4d935a15 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -17,6 +17,11 @@ static int cap_sysctl(ctl_table *table, int op)
        return 0;
 }
 
+static int cap_syslog(int type)
+{
+       return 0;
+}
+
 static int cap_quotactl(int cmds, int type, int id, struct super_block *sb)
 {
        return 0;
@@ -543,7 +548,7 @@ static int cap_sem_semop(struct sem_array *sma, struct sembuf *sops,
 }
 
 #ifdef CONFIG_SECURITY_NETWORK
-static int cap_unix_stream_connect(struct socket *sock, struct socket *other,
+static int cap_unix_stream_connect(struct sock *sock, struct sock *other,
                                   struct sock *newsk)
 {
        return 0;