Rename the helper that wakes and waits for APs to bringup_aps(), ap_init()
is terribly confusing because it's called from the BSP, not APs.
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
lib/x86/setup.c | 2 +-
lib/x86/smp.c | 2 +-
lib/x86/smp.h | 2 +-
x86/cstart.S | 2 +-
x86/cstart64.S | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/x86/setup.c b/lib/x86/setup.c
index 2f60a58..d9fd9e7 100644
--- a/lib/x86/setup.c
+++ b/lib/x86/setup.c
@@ -357,7 +357,7 @@ efi_status_t setup_efi(efi_bootinfo_t *efi_bootinfo)
setup_page_table();
enable_apic();
save_id();
- ap_init();
+ bringup_aps();
enable_x2apic();
smp_init();
diff --git a/lib/x86/smp.c b/lib/x86/smp.c
index e056181..dd4eb8c 100644
--- a/lib/x86/smp.c
+++ b/lib/x86/smp.c
@@ -242,7 +242,7 @@ static void setup_rm_gdt(void)
#endif
}
-void ap_init(void)
+void bringup_aps(void)
{
void *rm_trampoline_dst = RM_TRAMPOLINE_ADDR;
size_t rm_trampoline_size = (&rm_trampoline_end - &rm_trampoline) + 1;
diff --git a/lib/x86/smp.h b/lib/x86/smp.h
index 3a5ad1b..3ddc39e 100644
--- a/lib/x86/smp.h
+++ b/lib/x86/smp.h
@@ -84,7 +84,7 @@ void on_cpu(int cpu, void (*function)(void *data), void *data);
void on_cpu_async(int cpu, void (*function)(void *data), void *data);
void on_cpus(void (*function)(void *data), void *data);
void smp_reset_apic(void);
-void ap_init(void);
+void bringup_aps(void);
extern atomic_t cpu_online_count;
extern unsigned char online_cpus[(MAX_TEST_CPUS + 7) / 8];
diff --git a/x86/cstart.S b/x86/cstart.S
index 0707985..fdbe343 100644
--- a/x86/cstart.S
+++ b/x86/cstart.S
@@ -114,7 +114,7 @@ start32:
call save_id
call mask_pic_interrupts
call enable_apic
- call ap_init
+ call bringup_aps
call enable_x2apic
call smp_init
push $__environ
diff --git a/x86/cstart64.S b/x86/cstart64.S
index e44d46c..80b3552 100644
--- a/x86/cstart64.S
+++ b/x86/cstart64.S
@@ -118,7 +118,7 @@ start64:
mov %rax, __args(%rip)
call __setup_args
- call ap_init
+ call bringup_aps
call enable_x2apic
call smp_init
--
2.36.1.476.g0c4daa206d-goog
