OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm-intel-next-fixes-2015-07-02' of git://anongit.freedesktop.org/drm...
[uclinux-h8/linux.git]
/
include
/
net
/
af_vsock.h
diff --git
a/include/net/af_vsock.h
b/include/net/af_vsock.h
index
172632d
..
db639a4
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 ****/