From f799e24625682f0a955600e3b656650ddc1aec54 Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Sat, 2 Oct 2010 15:40:59 +0200 Subject: [PATCH] Defer LAPIC checking from pmap_bootstrap() to mp_enable() Similar to commit 8b5fcfe2eabb8f50c8211d71788097cd4bfd98ba --- sys/platform/pc64/x86_64/mp_machdep.c | 3 +++ sys/platform/pc64/x86_64/pmap.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/platform/pc64/x86_64/mp_machdep.c b/sys/platform/pc64/x86_64/mp_machdep.c index cdcfa81f17..8e7c812c7a 100644 --- a/sys/platform/pc64/x86_64/mp_machdep.c +++ b/sys/platform/pc64/x86_64/mp_machdep.c @@ -550,6 +550,9 @@ mp_enable(u_int boot_addr) POSTCODE(MP_ENABLE_POST); + if (cpu_apic_address == 0) + panic("pmap_bootstrap: no local apic!"); + #if 0 /* JGXXX */ /* turn on 4MB of V == P addressing so we can get to MP table */ *(int *)PTD = PG_V | PG_RW | ((uintptr_t)(void *)KPTphys & PG_FRAME); diff --git a/sys/platform/pc64/x86_64/pmap.c b/sys/platform/pc64/x86_64/pmap.c index 67d720d8d9..dd5fea519a 100644 --- a/sys/platform/pc64/x86_64/pmap.c +++ b/sys/platform/pc64/x86_64/pmap.c @@ -697,10 +697,6 @@ pmap_bootstrap(vm_paddr_t *firstaddr) #endif } #endif -#ifdef SMP - if (cpu_apic_address == 0) - panic("pmap_bootstrap: no local apic!"); -#endif /* * We need to finish setting up the globaldata page for the BSP. -- 2.41.0