projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.2-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
af_vsock.h
diff --git
a/include/net/af_vsock.h
b/include/net/af_vsock.h
index 172632dd9930d1d98a68e47076c97fba3bd2c7ae..db639a4c5ab84cab3339193010641f0b0187db48 100644
(file)
--- a/
include/net/af_vsock.h
+++ b/
include/net/af_vsock.h
@@
-74,7
+74,7
@@
void vsock_pending_work(struct work_struct *work);
struct sock *__vsock_create(struct net *net,
struct socket *sock,
struct sock *parent,
- gfp_t priority, unsigned short type);
+ gfp_t priority, unsigned short type
, int kern
);
/**** TRANSPORT ****/