diff options
Diffstat (limited to 'net/socket.c')
-rw-r--r-- | net/socket.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/socket.c b/net/socket.c index 4da14cbd49b6..45afa648364a 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -1148,7 +1148,7 @@ EXPORT_SYMBOL(sock_create_lite); | |||
1148 | /* No kernel lock held - perfect */ | 1148 | /* No kernel lock held - perfect */ |
1149 | static unsigned int sock_poll(struct file *file, poll_table *wait) | 1149 | static unsigned int sock_poll(struct file *file, poll_table *wait) |
1150 | { | 1150 | { |
1151 | unsigned int ll_flag = 0; | 1151 | unsigned int busy_flag = 0; |
1152 | struct socket *sock; | 1152 | struct socket *sock; |
1153 | 1153 | ||
1154 | /* | 1154 | /* |
@@ -1156,16 +1156,16 @@ static unsigned int sock_poll(struct file *file, poll_table *wait) | |||
1156 | */ | 1156 | */ |
1157 | sock = file->private_data; | 1157 | sock = file->private_data; |
1158 | 1158 | ||
1159 | if (sk_valid_ll(sock->sk)) { | 1159 | if (sk_can_busy_loop(sock->sk)) { |
1160 | /* this socket can poll_ll so tell the system call */ | 1160 | /* this socket can poll_ll so tell the system call */ |
1161 | ll_flag = POLL_LL; | 1161 | busy_flag = POLL_BUSY_LOOP; |
1162 | 1162 | ||
1163 | /* once, only if requested by syscall */ | 1163 | /* once, only if requested by syscall */ |
1164 | if (wait && (wait->_key & POLL_LL)) | 1164 | if (wait && (wait->_key & POLL_BUSY_LOOP)) |
1165 | sk_poll_ll(sock->sk, 1); | 1165 | sk_busy_loop(sock->sk, 1); |
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | return ll_flag | sock->ops->poll(file, sock, wait); | 1168 | return busy_flag | sock->ops->poll(file, sock, wait); |
1169 | } | 1169 | } |
1170 | 1170 | ||
1171 | static int sock_mmap(struct file *file, struct vm_area_struct *vma) | 1171 | static int sock_mmap(struct file *file, struct vm_area_struct *vma) |