aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/i386/kernel/vmi.c7
-rw-r--r--arch/i386/kernel/vmitime.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/i386/kernel/vmi.c b/arch/i386/kernel/vmi.c
index af8c54245f9a..245d091d659d 100644
--- a/arch/i386/kernel/vmi.c
+++ b/arch/i386/kernel/vmi.c
@@ -525,13 +525,14 @@ void vmi_pmd_clear(pmd_t *pmd)
525#endif 525#endif
526 526
527#ifdef CONFIG_SMP 527#ifdef CONFIG_SMP
528struct vmi_ap_state ap;
529extern void setup_pda(void); 528extern void setup_pda(void);
530 529
531static void __init /* XXX cpu hotplug */ 530static void __devinit
532vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip, 531vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
533 unsigned long start_esp) 532 unsigned long start_esp)
534{ 533{
534 struct vmi_ap_state ap;
535
535 /* Default everything to zero. This is fine for most GPRs. */ 536 /* Default everything to zero. This is fine for most GPRs. */
536 memset(&ap, 0, sizeof(struct vmi_ap_state)); 537 memset(&ap, 0, sizeof(struct vmi_ap_state));
537 538
@@ -570,7 +571,7 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
570 /* Protected mode, paging, AM, WP, NE, MP. */ 571 /* Protected mode, paging, AM, WP, NE, MP. */
571 ap.cr0 = 0x80050023; 572 ap.cr0 = 0x80050023;
572 ap.cr4 = mmu_cr4_features; 573 ap.cr4 = mmu_cr4_features;
573 vmi_ops.set_initial_ap_state(__pa(&ap), phys_apicid); 574 vmi_ops.set_initial_ap_state((u32)&ap, phys_apicid);
574} 575}
575#endif 576#endif
576 577
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)
243 243
244/* Initialize the time accounting variables for an AP on an SMP system. 244/* Initialize the time accounting variables for an AP on an SMP system.
245 * Also, set the local alarm for the AP. */ 245 * Also, set the local alarm for the AP. */
246void __init vmi_timer_setup_secondary_alarm(void) 246void __devinit vmi_timer_setup_secondary_alarm(void)
247{ 247{
248 int cpu = smp_processor_id(); 248 int cpu = smp_processor_id();
249 249