lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] vmi: smp fixes

Browse Source 
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>
This commit is contained in:
Zachary Amsden
2007-03-05 00:30:43 -08:00
committed by Linus Torvalds
parent 772205f62e
commit c6b36e9a3c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/i386/kernel/vmi.c
View File

@@ -525,13 +525,14 @@ void vmi_pmd_clear(pmd_t *pmd)
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
struct vmi_ap_state ap;
extern void setup_pda(void); 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, vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
unsigned long start_esp) unsigned long start_esp)
{ {
struct vmi_ap_state ap;
/* Default everything to zero. This is fine for most GPRs. */ /* Default everything to zero. This is fine for most GPRs. */
memset(&ap, 0, sizeof(struct vmi_ap_state)); 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. */ /* Protected mode, paging, AM, WP, NE, MP. */
ap.cr0 = 0x80050023; ap.cr0 = 0x80050023;
ap.cr4 = mmu_cr4_features; 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 #endif

2
arch/i386/kernel/vmitime.c
View File

@@ -243,7 +243,7 @@ void __init vmi_timer_setup_boot_alarm(void)
/* Initialize the time accounting variables for an AP on an SMP system. /* Initialize the time accounting variables for an AP on an SMP system.
* Also, set the local alarm for the AP. */ * 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(); int cpu = smp_processor_id();