diff --git a/[refs] b/[refs]
index 30ccae16bb75..8e379a08c9f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b019e57321f3e006c0ec7a54f13efc377bcb6451
+refs/heads/master: b4be625852618636a6b54908c4f9d90fb29dc549
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index a05817c021d6..d4527dcef1af 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1219,11 +1219,11 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info)
  */
 static struct lock_class_key base_lock_keys[NR_CPUS];
 
-static int __devinit init_timers_cpu(int cpu)
+static int __cpuinit init_timers_cpu(int cpu)
 {
 	int j;
 	tvec_base_t *base;
-	static char __devinitdata tvec_base_done[NR_CPUS];
+	static char __cpuinitdata tvec_base_done[NR_CPUS];
 
 	if (!tvec_base_done[cpu]) {
 		static char boot_done;