diff options
| author | ronaxdevil <pratabidya.007@gmail.com> | 2020-06-06 12:16:58 +0530 |
|---|---|---|
| committer | lucasponez <lucasponez@outlook.com> | 2020-12-06 05:32:19 -0800 |
| commit | c9d101bffe7b6a10fddc18bc7a2d0dc0962ed71f (patch) | |
| tree | cc92c8d9bbff0f97a4036908f210b2adb2adaf1a /include/net/af_unix.h | |
| parent | 13ba6318ccffd7e3167f514ac34358ab74ff6b6c (diff) | |
Merge tag 'v3.18.140' of https://source.codeaurora.org/quic/la/kernel/msm-3.18 into android-10-release-qpk30.54r11.0
This is the 3.18.140 stable release
gpg: Signature made Thu 16 May 2019 12:47:33 PM IST
gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
Signed-off-by: ronaxdevil <pratabidya.007@gmail.com>
Diffstat (limited to 'include/net/af_unix.h')
| -rw-r--r-- | include/net/af_unix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/af_unix.h b/include/net/af_unix.h index e830c3dff61a..7bb69c9c3c43 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -6,8 +6,8 @@ #include <linux/mutex.h> #include <net/sock.h> -void unix_inflight(struct file *fp); -void unix_notinflight(struct file *fp); +void unix_inflight(struct user_struct *user, struct file *fp); +void unix_notinflight(struct user_struct *user, struct file *fp); void unix_gc(void); void wait_for_unix_gc(void); struct sock *unix_get_socket(struct file *filp); |