aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/hrtimer.c2
-rw-r--r--kernel/timer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index e65dd0b47cdc..f994bb8065e6 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp)
1378/* 1378/*
1379 * Functions related to boot-time initialization: 1379 * Functions related to boot-time initialization:
1380 */ 1380 */
1381static void __devinit init_hrtimers_cpu(int cpu) 1381static void __cpuinit init_hrtimers_cpu(int cpu)
1382{ 1382{
1383 struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu); 1383 struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
1384 int i; 1384 int i;
diff --git a/kernel/timer.c b/kernel/timer.c
index 26671f4db07f..2a00c22203f3 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1289,7 +1289,7 @@ static void migrate_timer_list(tvec_base_t *new_base, struct list_head *head)
1289 } 1289 }
1290} 1290}
1291 1291
1292static void __devinit migrate_timers(int cpu) 1292static void __cpuinit migrate_timers(int cpu)
1293{ 1293{
1294 tvec_base_t *old_base; 1294 tvec_base_t *old_base;
1295 tvec_base_t *new_base; 1295 tvec_base_t *new_base;