diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 02:15:57 -0400 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /kernel/hrtimer.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
Merge branch 'merge'
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 d2a7296c8251..b7f0388bd71c 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -836,7 +836,7 @@ static void migrate_hrtimers(int cpu) | |||
| 836 | } | 836 | } |
| 837 | #endif /* CONFIG_HOTPLUG_CPU */ | 837 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 838 | 838 | ||
| 839 | static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | 839 | static int hrtimer_cpu_notify(struct notifier_block *self, |
| 840 | unsigned long action, void *hcpu) | 840 | unsigned long action, void *hcpu) |
| 841 | { | 841 | { |
| 842 | long cpu = (long)hcpu; | 842 | long cpu = (long)hcpu; |
| @@ -860,7 +860,7 @@ static int __devinit hrtimer_cpu_notify(struct notifier_block *self, | |||
| 860 | return NOTIFY_OK; | 860 | return NOTIFY_OK; |
| 861 | } | 861 | } |
| 862 | 862 | ||
| 863 | static struct notifier_block __devinitdata hrtimers_nb = { | 863 | static struct notifier_block hrtimers_nb = { |
| 864 | .notifier_call = hrtimer_cpu_notify, | 864 | .notifier_call = hrtimer_cpu_notify, |
| 865 | }; | 865 | }; |
| 866 | 866 | ||