diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /kernel/timer.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
| download | linux-29f147d746326e4db5fe350c70373081d61a2965.tar.gz | |
Merge branch 'merge'
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 88377378883619..67eaf0f54096f8 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1314,7 +1314,7 @@ static void __devinit migrate_timers(int cpu) } #endif /* CONFIG_HOTPLUG_CPU */ -static int __devinit timer_cpu_notify(struct notifier_block *self, +static int timer_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu) { long cpu = (long)hcpu; @@ -1334,7 +1334,7 @@ static int __devinit timer_cpu_notify(struct notifier_block *self, return NOTIFY_OK; } -static struct notifier_block __devinitdata timers_nb = { +static struct notifier_block timers_nb = { .notifier_call = timer_cpu_notify, }; |