diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /kernel/hrtimer.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
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 55601b3ce60e..8d3dc29ef41a 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
| @@ -833,7 +833,7 @@ static void migrate_hrtimers(int cpu) | |||
| 833 | } | 833 | } |
| 834 | #endif /* CONFIG_HOTPLUG_CPU */ | 834 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 835 | 835 | ||
| 836 | static int hrtimer_cpu_notify(struct notifier_block *self, | 836 | static int __devinit hrtimer_cpu_notify(struct notifier_block *self, |
| 837 | unsigned long action, void *hcpu) | 837 | unsigned long action, void *hcpu) |
| 838 | { | 838 | { |
| 839 | long cpu = (long)hcpu; | 839 | long cpu = (long)hcpu; |
| @@ -857,7 +857,7 @@ static int hrtimer_cpu_notify(struct notifier_block *self, | |||
| 857 | return NOTIFY_OK; | 857 | return NOTIFY_OK; |
| 858 | } | 858 | } |
| 859 | 859 | ||
| 860 | static struct notifier_block hrtimers_nb = { | 860 | static struct notifier_block __devinitdata hrtimers_nb = { |
| 861 | .notifier_call = hrtimer_cpu_notify, | 861 | .notifier_call = hrtimer_cpu_notify, |
| 862 | }; | 862 | }; |
| 863 | 863 | ||