diff options
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index f0f4fe29cd21..383319bae3f7 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -1659,7 +1659,7 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp, | |||
| 1659 | /* | 1659 | /* |
| 1660 | * Functions related to boot-time initialization: | 1660 | * Functions related to boot-time initialization: |
| 1661 | */ | 1661 | */ |
| 1662 | static void __cpuinit init_hrtimers_cpu(int cpu) | 1662 | static void init_hrtimers_cpu(int cpu) |
| 1663 | { | 1663 | { |
| 1664 | struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu); | 1664 | struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu); |
| 1665 | int i; | 1665 | int i; |
| @@ -1740,7 +1740,7 @@ static void migrate_hrtimers(int scpu) | |||
| 1740 | 1740 | ||
| 1741 | #endif /* CONFIG_HOTPLUG_CPU */ | 1741 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 1742 | 1742 | ||
| 1743 | static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, | 1743 | static int hrtimer_cpu_notify(struct notifier_block *self, |
| 1744 | unsigned long action, void *hcpu) | 1744 | unsigned long action, void *hcpu) |
| 1745 | { | 1745 | { |
| 1746 | int scpu = (long)hcpu; | 1746 | int scpu = (long)hcpu; |
| @@ -1773,7 +1773,7 @@ static int __cpuinit hrtimer_cpu_notify(struct notifier_block *self, | |||
| 1773 | return NOTIFY_OK; | 1773 | return NOTIFY_OK; |
| 1774 | } | 1774 | } |
| 1775 | 1775 | ||
| 1776 | static struct notifier_block __cpuinitdata hrtimers_nb = { | 1776 | static struct notifier_block hrtimers_nb = { |
| 1777 | .notifier_call = hrtimer_cpu_notify, | 1777 | .notifier_call = hrtimer_cpu_notify, |
| 1778 | }; | 1778 | }; |
| 1779 | 1779 | ||
