diff --git a/[refs] b/[refs]
index 74d0b78d14cf..3c7fb8b11290 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc0fde2fad007a81ecffceb25a893a6c3f1ed767
+refs/heads/master: 8ab19ea36c5c5340ff598e4d15fc084eb65671dc
diff --git a/trunk/net/ipv4/ipvs/ip_vs_est.c b/trunk/net/ipv4/ipvs/ip_vs_est.c
index bc04eedd6dbb..1d6e58e502fd 100644
--- a/trunk/net/ipv4/ipvs/ip_vs_est.c
+++ b/trunk/net/ipv4/ipvs/ip_vs_est.c
@@ -170,8 +170,11 @@ void ip_vs_kill_estimator(struct ip_vs_stats *stats)
 		kfree(est);
 		killed++;
 	}
-	if (killed && est_list == NULL)
-		del_timer_sync(&est_timer);
+	while (killed && !est_list && try_to_del_timer_sync(&est_timer) < 0) {
+		write_unlock_bh(&est_lock);
+		cpu_relax();
+		write_lock_bh(&est_lock);
+	}
 	write_unlock_bh(&est_lock);
 }