From 0ae320e36ee7c442d79a4c69a457aac4f55595f0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 12 Sep 2016 13:06:00 -0600
Subject: [PATCH] Cleanup PML4 entries, pass correct cpu ID to trampoline
---
x86_64/startup-x86_64.asm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/x86_64/startup-x86_64.asm b/x86_64/startup-x86_64.asm
index 3d9b865..fa6b9e8 100644
--- a/x86_64/startup-x86_64.asm
+++ b/x86_64/startup-x86_64.asm
@@ -1,5 +1,6 @@
trampoline:
.ready: dq 0
+ .cpu_id: dq 0
.stack_start: dq 0
.stack_end: dq 0
.code: dq 0
@@ -131,11 +132,11 @@ long_mode_ap:
mov gs, rax
mov ss, rax
+ mov rdi, [trampoline.cpu_id]
+ mov rsi, [trampoline.stack_start]
+ mov rdx, [trampoline.stack_end]
- mov rdi, [trampoline.stack_start]
- mov rsi, [trampoline.stack_end]
-
- lea rsp, [rsi - 16]
+ lea rsp, [rdx - 256]
mov qword [trampoline.ready], 1
mov rax, [trampoline.code]
--
GitLab