Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6b36e9a authored by Zachary Amsden's avatar Zachary Amsden Committed by Linus Torvalds
Browse files

[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: default avatarZachary Amsden <zach@vmware.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 772205f6

arch/i386/kernel/vmi.c

+4 −3
Original line number Diff line number Diff line
@@ -525,13 +525,14 @@ void vmi_pmd_clear(pmd_t *pmd) 
#endif



#ifdef CONFIG_SMP

struct vmi_ap_state ap;

extern void setup_pda(void);



static void __init /* XXX cpu hotplug */

static void __devinit

vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,

		     unsigned long start_esp)

{

	struct vmi_ap_state ap;



	/* Default everything to zero.  This is fine for most GPRs. */

	memset(&ap, 0, sizeof(struct vmi_ap_state));
@@ -570,7 +571,7 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip, 
	/* Protected mode, paging, AM, WP, NE, MP. */

	ap.cr0 = 0x80050023;

	ap.cr4 = mmu_cr4_features;

	vmi_ops.set_initial_ap_state(__pa(&ap), phys_apicid);

	vmi_ops.set_initial_ap_state((u32)&ap, phys_apicid);

}

#endif

arch/i386/kernel/vmitime.c

+1 −1
Original line number Diff line number Diff line
@@ -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();