diff --git a/[refs] b/[refs] index 3d843082398c..aa619bef6b4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66ba886254edbbd9442d30f1eef6f6fb0145027d +refs/heads/master: d90bf5a976793edfa88d3bb2393f0231eb8ce1e5 diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 45651834e1e2..1bff9ed349ff 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -578,6 +578,9 @@ static void rt_check_expire(struct work_struct *work) i = (i + 1) & rt_hash_mask; rthp = &rt_hash_table[i].chain; + if (need_resched()) + cond_resched(); + if (*rthp == NULL) continue; spin_lock_bh(rt_hash_lock_addr(i));