diff --git a/[refs] b/[refs]
index dd1563c57c22..98f9f5cbcac6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1294fc4a4868d7e83ff749597fbf4e9d5f4d1aa0
+refs/heads/master: 2fa7527ba1d38175d1e42f7cb72bae5de3d55cc7
diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c
index 7cdd2bf88e0c..a1c5b8dbdfed 100644
--- a/trunk/net/ipv4/route.c
+++ b/trunk/net/ipv4/route.c
@@ -3058,7 +3058,9 @@ int __init ip_rt_init(void)
 	devinet_init();
 	ip_fib_init();
 
-	setup_timer(&rt_secret_timer, rt_secret_rebuild, 0);
+	rt_secret_timer.function = rt_secret_rebuild;
+	rt_secret_timer.data = 0;
+	init_timer_deferrable(&rt_secret_timer);
 
 	/* All the timers, started at system startup tend
 	   to synchronize. Perturb it a bit.