aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/vmitime.c
diff options
context:
space:
mode:
authorZachary Amsden <zach@vmware.com>2007-03-05 00:30:43 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-05 07:57:53 -0800
commitc6b36e9a3c57b73c7a6bdf787baa55f21195bba9 (patch)
tree3e9e745420dc2f33f19140dbfcc34d8c042c675d /arch/i386/kernel/vmitime.c
parent[PATCH] vmi: apic ops (diff)
downloadlinux-dev-c6b36e9a3c57b73c7a6bdf787baa55f21195bba9.tar.xz
linux-dev-c6b36e9a3c57b73c7a6bdf787baa55f21195bba9.zip
[PATCH] vmi: smp fixes
Critical fixes for SMP. Fix a couple functions which needed to be __devinit and fix a bogus parameter to AP startup that just so happened to work because the low virtual mapping of memory was still established. Signed-off-by: Zachary Amsden <zach@vmware.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--arch/i386/kernel/vmitime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/vmitime.c b/arch/i386/kernel/vmitime.c
index d21779749838..8dc72d575666 100644
--- a/arch/i386/kernel/vmitime.c
+++ b/arch/i386/kernel/vmitime.c
@@ -243,7 +243,7 @@ void __init vmi_timer_setup_boot_alarm(void)
/* Initialize the time accounting variables for an AP on an SMP system.
* Also, set the local alarm for the AP. */
-void __init vmi_timer_setup_secondary_alarm(void)
+void __devinit vmi_timer_setup_secondary_alarm(void)
{
int cpu = smp_processor_id();