diff options
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index d17766d40dab..be989efc7856 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -835,7 +835,7 @@ static void migrate_hrtimers(int cpu) | |||
| 835 | } | 835 | } |
| 836 | #endif /* CONFIG_HOTPLUG_CPU */ | 836 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 837 | 837 | ||
| 838 | static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | 838 | static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, |
| 839 | unsigned long action, void *hcpu) | 839 | unsigned long action, void *hcpu) |
| 840 | { | 840 | { |
| 841 | long cpu = (long)hcpu; | 841 | long cpu = (long)hcpu; |
| @@ -859,7 +859,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | |||
| 859 | return NOTIFY_OK; | 859 | return NOTIFY_OK; |
| 860 | } | 860 | } |
| 861 | 861 | ||
| 862 | static struct notifier_block __devinitdata hrtimers_nb = { | 862 | static struct notifier_block __cpuinitdata hrtimers_nb = { |
| 863 | .notifier_call = hrtimer_cpu_notify, | 863 | .notifier_call = hrtimer_cpu_notify, |
| 864 | }; | 864 | }; |
| 865 | 865 | ||
