From d2df55b1ac799e4830f3450b161f2ed70384af73 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Wed, 3 Apr 2024 02:30:38 +0300
Subject: [PATCH] Kernel: Allow booting with multiple processors on i686

Also remove unnecessary ds clearing in x86_64.
---
 kernel/arch/i686/boot.S   | 4 ----
 kernel/arch/x86_64/boot.S | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/kernel/arch/i686/boot.S b/kernel/arch/i686/boot.S
index 118d90977e..7e35c728c1 100644
--- a/kernel/arch/i686/boot.S
+++ b/kernel/arch/i686/boot.S
@@ -231,7 +231,6 @@ system_halt:
 .code16
 .global ap_trampoline
 ap_trampoline:
-	ud2
 	jmp 1f
 .align 8
 ap_stack_ptr:
@@ -239,10 +238,7 @@ ap_stack_ptr:
 1:
 	cli; cld
 	ljmpl $0x00, $ap_cs_clear
-
 ap_cs_clear:
-	xorw %ax, %ax
-	movw %ax, %ds
 
 	# load ap gdt and enter protected mode
 	lgdt ap_gdtr
diff --git a/kernel/arch/x86_64/boot.S b/kernel/arch/x86_64/boot.S
index 4d4d1d00f9..0309dc2f49 100644
--- a/kernel/arch/x86_64/boot.S
+++ b/kernel/arch/x86_64/boot.S
@@ -249,10 +249,7 @@ ap_stack_ptr:
 1:
 	cli; cld
 	ljmpl $0x00, $ap_cs_clear
-
 ap_cs_clear:
-	xorw %ax, %ax
-	movw %ax, %ds
 
 	# load ap gdt and enter protected mode
 	lgdt ap_gdtr