From 74fc6058544c15cdd5ebe26b657d7bfaa19c8ef5 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 21 Jan 2008 17:18:25 -0800
Subject: [PATCH] --- yaml --- r: 75599 b: refs/heads/master c:
 48ccf3dac341118992b70ca89c47728e8b1d300b h: refs/heads/master i:   75597:
 e2757cd2fcd84aff2a16d107eb84bda2b4703f88   75595:
 81fa824942153cf2b6d3567e75d12fc07f9a0da5   75591:
 f296bf05e0870f1adf0c944bf0b4fe471c9231a6   75583:
 e38cb39b854b8adc719a02c275b8ed9f2858a6f4 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a4474c2760e0..8899f9c7c977 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ec160dd48b666ddef39d639323d0da26d0b710d
+refs/heads/master: 48ccf3dac341118992b70ca89c47728e8b1d300b
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 26671f4db07f..2a00c22203f3 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
 	}
 }
 
-static void __devinit migrate_timers(int cpu)
+static void __cpuinit migrate_timers(int cpu)
 {
 	tvec_base_t *old_base;
 	tvec_base_t *new_base;