diff --git a/[refs] b/[refs]
index b5493d1dc885..184c95cfd5ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e870a8efcddaaa3da7e180b6ae21239fb96aa2bb
+refs/heads/master: 789675e216617b1331875c42a81f58227a06df91
diff --git a/trunk/net/core/gen_estimator.c b/trunk/net/core/gen_estimator.c
index daadbcc4e8dd..86037d16f199 100644
--- a/trunk/net/core/gen_estimator.c
+++ b/trunk/net/core/gen_estimator.c
@@ -135,7 +135,7 @@ static void est_timer(unsigned long arg)
 	}
 
 	if (!list_empty(&elist[idx].list))
-		mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+		mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
 	rcu_read_unlock();
 }
 
@@ -191,7 +191,7 @@ int gen_new_estimator(struct gnet_stats_basic *bstats,
 	}
 
 	if (list_empty(&elist[idx].list))
-		mod_timer(&elist[idx].timer, jiffies + ((HZ<<idx)/4));
+		mod_timer(&elist[idx].timer, jiffies + ((HZ/4) << idx));
 
 	list_add_rcu(&est->list, &elist[idx].list);
 	return 0;