summaryrefslogtreecommitdiff
path: root/Kernel/Arch
diff options
context:
space:
mode:
authorDaniel Bertalan <dani@danielbertalan.dev>2021-07-08 13:32:25 +0200
committerAndreas Kling <kling@serenityos.org>2021-07-14 13:12:25 +0200
commitef40de9c6c475cde9ce6a74ebc0cd9a6594f4cb3 (patch)
tree75b34eca7e2baeccaae03b7d934cc85ae2f71381 /Kernel/Arch
parentb847541ee8566d5d90af6b49476a32351e2b11d6 (diff)
downloadserenity-ef40de9c6c475cde9ce6a74ebc0cd9a6594f4cb3.zip
Kernel: Don't mix AT&T and Intel ASM syntax in `boot.S`
The rest of the file is in AT&T syntax, so for the time being, I'll switch these instructions to AT&T too to make Clang shut up.
Diffstat (limited to 'Kernel/Arch')
-rw-r--r--Kernel/Arch/x86/common/Boot/boot.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/Arch/x86/common/Boot/boot.S b/Kernel/Arch/x86/common/Boot/boot.S
index c5e6f81081..011e7f05d9 100644
--- a/Kernel/Arch/x86/common/Boot/boot.S
+++ b/Kernel/Arch/x86/common/Boot/boot.S
@@ -260,7 +260,7 @@ exiting_real_mode:
/* far jump to protected_mode_16_bit in 0x5000 */
pushw $8
push $PROTECTED_MODE_16_BIT_CODE
- retf
+ lret
hlt
.code16
@@ -275,7 +275,7 @@ protected_mode_16_bit:
pushw $0
push $REAL_MODE_CODE
- retf
+ lret
hlt
real_mode: