diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 05809c2e2fd..ee319fc69f4 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1688,7 +1688,7 @@ static void __devinit migrate_timers(int cpu) | |||
1688 | } | 1688 | } |
1689 | #endif /* CONFIG_HOTPLUG_CPU */ | 1689 | #endif /* CONFIG_HOTPLUG_CPU */ |
1690 | 1690 | ||
1691 | static int __devinit timer_cpu_notify(struct notifier_block *self, | 1691 | static int __cpuinit timer_cpu_notify(struct notifier_block *self, |
1692 | unsigned long action, void *hcpu) | 1692 | unsigned long action, void *hcpu) |
1693 | { | 1693 | { |
1694 | long cpu = (long)hcpu; | 1694 | long cpu = (long)hcpu; |
@@ -1708,7 +1708,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self, | |||
1708 | return NOTIFY_OK; | 1708 | return NOTIFY_OK; |
1709 | } | 1709 | } |
1710 | 1710 | ||
1711 | static struct notifier_block __devinitdata timers_nb = { | 1711 | static struct notifier_block __cpuinitdata timers_nb = { |
1712 | .notifier_call = timer_cpu_notify, | 1712 | .notifier_call = timer_cpu_notify, |
1713 | }; | 1713 | }; |
1714 | 1714 | ||