diff --git a/[refs] b/[refs] index 2785b84dfc58..73f32a85aca4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba6fd85021dec97d58373d9aea4bea8fc24258be +refs/heads/master: 375c6bbabf210ded3151481ca1ac7f730903512b diff --git a/trunk/net/ipv4/ipvs/ip_vs_sync.c b/trunk/net/ipv4/ipvs/ip_vs_sync.c index cf5ed758ea1f..45e9bd96c286 100644 --- a/trunk/net/ipv4/ipvs/ip_vs_sync.c +++ b/trunk/net/ipv4/ipvs/ip_vs_sync.c @@ -742,7 +742,7 @@ static int sync_thread_master(void *data) ip_vs_sync_buff_release(sb); } - msleep_interruptible(1000); + schedule_timeout_interruptible(HZ); } /* clean up the sync_buff queue */