projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux...
[deliverable/linux.git]
/
net
/
ipv4
/
inet_connection_sock.c
diff --git
a/net/ipv4/inet_connection_sock.c
b/net/ipv4/inet_connection_sock.c
index 14d02ea905b6bea37240f88054f0cd42db73c4c2..3e44b9b0b78ece392a1f1b0763b5445cadfb2557 100644
(file)
--- a/
net/ipv4/inet_connection_sock.c
+++ b/
net/ipv4/inet_connection_sock.c
@@
-268,6
+268,7
@@
static int inet_csk_wait_for_connect(struct sock *sk, long timeo)
release_sock(sk);
if (reqsk_queue_empty(&icsk->icsk_accept_queue))
timeo = schedule_timeout(timeo);
+ sched_annotate_sleep();
lock_sock(sk);
err = 0;
if (!reqsk_queue_empty(&icsk->icsk_accept_queue))
This page took
0.024402 seconds
and
5
git commands to generate.