diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index 6f05d5c4bf30..2f378449bc1b 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -118,7 +118,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from); | |||
118 | static int sock_mmap(struct file *file, struct vm_area_struct *vma); | 118 | static int sock_mmap(struct file *file, struct vm_area_struct *vma); |
119 | 119 | ||
120 | static int sock_close(struct inode *inode, struct file *file); | 120 | static int sock_close(struct inode *inode, struct file *file); |
121 | static unsigned int sock_poll(struct file *file, | 121 | static __poll_t sock_poll(struct file *file, |
122 | struct poll_table_struct *wait); | 122 | struct poll_table_struct *wait); |
123 | static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg); | 123 | static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg); |
124 | #ifdef CONFIG_COMPAT | 124 | #ifdef CONFIG_COMPAT |
@@ -1097,9 +1097,9 @@ out_release: | |||
1097 | EXPORT_SYMBOL(sock_create_lite); | 1097 | EXPORT_SYMBOL(sock_create_lite); |
1098 | 1098 | ||
1099 | /* No kernel lock held - perfect */ | 1099 | /* No kernel lock held - perfect */ |
1100 | static unsigned int sock_poll(struct file *file, poll_table *wait) | 1100 | static __poll_t sock_poll(struct file *file, poll_table *wait) |
1101 | { | 1101 | { |
1102 | unsigned int busy_flag = 0; | 1102 | __poll_t busy_flag = 0; |
1103 | struct socket *sock; | 1103 | struct socket *sock; |
1104 | 1104 | ||
1105 | /* | 1105 | /* |