From 3a4d3b15e359625e94cbc91835de9fae2be9870a Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 27 Jul 2021 19:43:20 +0200 Subject: [PATCH] Kernel: Fix CPU initialization for SMP This was broken by the KASLR changes. --- Kernel/Arch/x86/i386/Boot/ap_setup.S | 2 +- Kernel/Arch/x86/x86_64/Boot/ap_setup.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Kernel/Arch/x86/i386/Boot/ap_setup.S b/Kernel/Arch/x86/i386/Boot/ap_setup.S index 0a7df2f280..a71b6a9ad6 100644 --- a/Kernel/Arch/x86/i386/Boot/ap_setup.S +++ b/Kernel/Arch/x86/i386/Boot/ap_setup.S @@ -109,7 +109,7 @@ apic_ap_start32_2: /* push the Processor pointer this CPU is going to use */ movl (ap_cpu_init_processor_info_array - apic_ap_start)(%ebp), %eax - addl kernel_load_base, %eax + addl kernel_mapping_base, %eax movl 0(%eax, %esi, 4), %eax push %eax diff --git a/Kernel/Arch/x86/x86_64/Boot/ap_setup.S b/Kernel/Arch/x86/x86_64/Boot/ap_setup.S index 47c7f0aa86..fdada82798 100644 --- a/Kernel/Arch/x86/x86_64/Boot/ap_setup.S +++ b/Kernel/Arch/x86/x86_64/Boot/ap_setup.S @@ -141,7 +141,7 @@ apic_ap_start64: /* push the Processor pointer this CPU is going to use */ movq (ap_cpu_init_processor_info_array - apic_ap_start)(%ebp), %rax - leaq kernel_load_base(%rip), %r8 + leaq kernel_mapping_base(%rip), %r8 movq (%r8), %r8 addq %r8, %rax movq 0(%rax, %rsi, 4), %rax