projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index
c773635
..
2a5df2b
100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-548,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 sock
et *sock, struct socket
*other,
+static int cap_unix_stream_connect(struct sock
*sock, struct sock
*other,
struct sock *newsk)
{
return 0;